internally at least refer to multirow as "multivalues", to distinguish between

an INSERT that's used in executemany() as opposed to one which has a VALUES
clause with multiple entries.

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 5f515c936c57ffa8f999f0dd4895c349206dd63b..73d874bce12ebadd9210cab11d6e62caa73909e6 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1882,7 +1882,7 @@ class MySQLDialect(default.DefaultDialect):
 
     supports_sane_rowcount = True
     supports_sane_multi_rowcount = False
-    supports_multirow_insert = True
+    supports_multivalues_insert = True
 
     default_paramstyle = 'format'
     colspecs = colspecs

diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index 22667b3176171d72d0cf610abb8e21cc1df5e792..e92ab76c1e8660c959c7ce4721ce04f95026474e 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -1182,7 +1182,7 @@ class PGDialect(default.DefaultDialect):
 
     supports_default_values = True
     supports_empty_insert = False
-    supports_multirow_insert = True
+    supports_multivalues_insert = True
     default_paramstyle = 'pyformat'
     ischema_names = ischema_names
     colspecs = colspecs

diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index d1532b9bb14cf7c316bde73ed398c5907276951f..a5be0aa17d1ec3c4c319a23863522aa47d212ddc 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -601,7 +601,7 @@ class SQLiteDialect(default.DefaultDialect):
     supports_default_values = True
     supports_empty_insert = False
     supports_cast = True
-    supports_multirow_insert = True
+    supports_multivalues_insert = True
 
     default_paramstyle = 'qmark'
     execution_ctx_cls = SQLiteExecutionContext

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index 7de0dcee7be8d1ac87f9e2fe3ecee5a828f8d478..789fc610b699b16867719c2a1a3da7788413a521 100644 (file)
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -85,7 +85,7 @@ class DefaultDialect(interfaces.Dialect):
     default_paramstyle = 'named'
     supports_default_values = False
     supports_empty_insert = True
-    supports_multirow_insert = False
+    supports_multivalues_insert = False
 
     server_version_info = None
 

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 1e8bc376084bdbb20f2bbc1f8734be006f81cd31..87b549f47ffcb7834bf4f0970d2d250de7414e7f 100644 (file)
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1286,7 +1286,7 @@ class SQLCompiler(engine.Compiled):
                                     self.dialect.name)
 
         if insert_stmt._has_multi_parameters:
-            if not self.dialect.supports_multirow_insert:
+            if not self.dialect.supports_multivalues_insert:
                 raise exc.CompileError("The '%s' dialect with current database "
                                     "version settings does not support "
                                     "in-place multirow inserts." %

diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py
index 057da78497b2ca0a68da4ebdacc5dfc9eff3e8b3..2fb1b314344c0a1e3c3dce3cbaa48d19e95cd9e6 100644 (file)
--- a/lib/sqlalchemy/testing/requirements.py
+++ b/lib/sqlalchemy/testing/requirements.py
@@ -88,12 +88,12 @@ class SuiteRequirements(Requirements):
                 )
 
     @property
-    def multirow_inserts(self):
+    def multivalues_inserts(self):
         """target database must support multiple VALUES clauses in an
         INSERT statement."""
 
         return exclusions.skip_if(
-                    lambda: not self.db.dialect.supports_multirow_insert,
+                    lambda: not self.db.dialect.supports_multivalues_insert,
                     "Backend does not support multirow inserts."
                 )
 

diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index d017197278a00d72dad5f6f86911274e4cf5898b..f58d25db011b5cd2e84b9e8fe12c461395b2f94a 100644 (file)
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -2575,7 +2575,7 @@ class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
             stmt.compile, dialect=dialect
         )
 
-    def test_multirow_insert_not_supported(self):
+    def test_multivalues_insert_not_supported(self):
         stmt = table1.insert().values([{"myid": 1}, {"myid": 2}])
         dialect = default.DefaultDialect()
         assert_raises_message(
@@ -2585,7 +2585,7 @@ class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
             stmt.compile, dialect=dialect
         )
 
-    def test_multirow_insert_named(self):
+    def test_multivalues_insert_named(self):
         stmt = table1.insert().\
                     values([{"myid": 1, "name": 'a', "description": 'b'},
                             {"myid": 2, "name": 'c', "description": 'd'},
@@ -2598,7 +2598,7 @@ class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
                  "(:myid_2, :name_2, :description_2)"
 
         dialect = default.DefaultDialect()
-        dialect.supports_multirow_insert = True
+        dialect.supports_multivalues_insert = True
         self.assert_compile(stmt, result,
                 checkparams={
                     'description_2': 'f', 'name_2': 'e',
@@ -2608,7 +2608,7 @@ class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
                 },
                 dialect=dialect)
 
-    def test_multirow_insert_positional(self):
+    def test_multivalues_insert_positional(self):
         stmt = table1.insert().\
                     values([{"myid": 1, "name": 'a', "description": 'b'},
                             {"myid": 2, "name": 'c', "description": 'd'},
@@ -2621,7 +2621,7 @@ class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
                  "(%s, %s, %s)" \
 
         dialect = default.DefaultDialect()
-        dialect.supports_multirow_insert = True
+        dialect.supports_multivalues_insert = True
         dialect.paramstyle = "format"
         dialect.positional = True
         self.assert_compile(stmt, result,

diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 60adfa0b79fc2c411f07212e8d5086af0bd9dc04..2c0ee4a1863febd399639a69c01233b5c4844d00 100644 (file)
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -48,8 +48,8 @@ class QueryTest(fixtures.TestBase):
     def teardown_class(cls):
         metadata.drop_all()
 
-    @testing.requires.multirow_inserts
-    def test_multirow_insert(self):
+    @testing.requires.multivalues_inserts
+    def test_multivalues_insert(self):
         users.insert(values=[{'user_id':7, 'user_name':'jack'},
             {'user_id':8, 'user_name':'ed'}]).execute()
         rows = users.select().execute().fetchall()

diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index 3cb294023671c22f30a1c9e5524599faeb5b2f49..a182444e94a1e745effa097540396223f7a2b047 100644 (file)
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -108,7 +108,7 @@ class ReturningTest(fixtures.TestBase, AssertsExecutionResults):
             eq_(result2.fetchall(), [(2, 2, False, None), (3, 3, True, None)])
 
 
-    @testing.requires.multirow_inserts
+    @testing.requires.multivalues_inserts
     def test_multirow_returning(self):
         ins = table.insert().returning(table.c.id, table.c.persons).values(
                             [