summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-09-26 01:17:44 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-09-26 01:17:44 +0000
commit6201b4d88666983b883b96d22a159aa2594de94b (patch)
tree4036c155ca7c274ea4bd12c059fd8fcd277fc026 /lib/sqlalchemy/dialects
parentf81fdd9a9008a6517f89f2115765b7db9a32721b (diff)
parenta8029f5a7e3e376ec57f1614ab0294b717d53c05 (diff)
downloadsqlalchemy-6201b4d88666983b883b96d22a159aa2594de94b.tar.gz
Merge "ORM bulk insert via execute" into main
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/mssql/pyodbc.py2
-rw-r--r--lib/sqlalchemy/dialects/postgresql/provision.py4
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py5
3 files changed, 4 insertions, 7 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/pyodbc.py b/lib/sqlalchemy/dialects/mssql/pyodbc.py
index 2eef971cc..5eb6b9528 100644
--- a/lib/sqlalchemy/dialects/mssql/pyodbc.py
+++ b/lib/sqlalchemy/dialects/mssql/pyodbc.py
@@ -301,7 +301,7 @@ Fast Executemany Mode
The SQL Server ``fast_executemany`` parameter may be used at the same time
as ``insertmanyvalues`` is enabled; however, the parameter will not be used
in as many cases as INSERT statements that are invoked using Core
- :class:`.Insert` constructs as well as all ORM use no longer use the
+ :class:`_dml.Insert` constructs as well as all ORM use no longer use the
``.executemany()`` DBAPI cursor method.
The PyODBC driver includes support for a "fast executemany" mode of execution
diff --git a/lib/sqlalchemy/dialects/postgresql/provision.py b/lib/sqlalchemy/dialects/postgresql/provision.py
index 8dd8a4995..4609701a2 100644
--- a/lib/sqlalchemy/dialects/postgresql/provision.py
+++ b/lib/sqlalchemy/dialects/postgresql/provision.py
@@ -134,9 +134,11 @@ def _upsert(cfg, table, returning, set_lambda=None):
stmt = insert(table)
+ table_pk = inspect(table).selectable
+
if set_lambda:
stmt = stmt.on_conflict_do_update(
- index_elements=table.primary_key, set_=set_lambda(stmt.excluded)
+ index_elements=table_pk.primary_key, set_=set_lambda(stmt.excluded)
)
else:
stmt = stmt.on_conflict_do_nothing()
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index e57a84fe0..5f468edbe 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -1466,11 +1466,6 @@ class SQLiteCompiler(compiler.SQLCompiler):
return target_text
- def visit_insert(self, insert_stmt, **kw):
- if insert_stmt._post_values_clause is not None:
- kw["disable_implicit_returning"] = True
- return super().visit_insert(insert_stmt, **kw)
-
def visit_on_conflict_do_nothing(self, on_conflict, **kw):
target_text = self._on_conflict_target(on_conflict, **kw)