summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-12-08 16:17:20 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-12-08 16:17:20 -0500
commit8070cbde716a247f8b31c1334c80fa53327e6d8e (patch)
tree7c610799dcedc15265c2f8264d32cd1ca240b6ef /lib
parent927b9859834096dd77182f935ff611351407f0dc (diff)
downloadsqlalchemy-8070cbde716a247f8b31c1334c80fa53327e6d8e.tar.gz
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.
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py2
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py2
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py2
-rw-r--r--lib/sqlalchemy/engine/default.py2
-rw-r--r--lib/sqlalchemy/sql/compiler.py2
-rw-r--r--lib/sqlalchemy/testing/requirements.py4
6 files changed, 7 insertions, 7 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 5f515c936..73d874bce 100644
--- 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 22667b317..e92ab76c1 100644
--- 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 d1532b9bb..a5be0aa17 100644
--- 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 7de0dcee7..789fc610b 100644
--- 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 1e8bc3760..87b549f47 100644
--- 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 057da7849..2fb1b3143 100644
--- 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."
)