summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/firebird/base.py2
-rw-r--r--lib/sqlalchemy/dialects/mssql/base.py10
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py7
-rw-r--r--lib/sqlalchemy/dialects/oracle/base.py6
-rw-r--r--lib/sqlalchemy/dialects/postgresql/base.py2
5 files changed, 15 insertions, 12 deletions
diff --git a/lib/sqlalchemy/dialects/firebird/base.py b/lib/sqlalchemy/dialects/firebird/base.py
index 82861e30f..7fc914f1b 100644
--- a/lib/sqlalchemy/dialects/firebird/base.py
+++ b/lib/sqlalchemy/dialects/firebird/base.py
@@ -614,7 +614,7 @@ class FBExecutionContext(default.DefaultExecutionContext):
return self._execute_scalar(
"SELECT gen_id(%s, 1) FROM rdb$database"
- % self.dialect.identifier_preparer.format_sequence(seq),
+ % self.identifier_preparer.format_sequence(seq),
type_,
)
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index 9d0e5d322..674d54179 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -17,7 +17,7 @@ External Dialects
In addition to the above DBAPI layers with native SQLAlchemy support, there
are third-party dialects for other DBAPI layers that are compatible
with SQL Server. See the "External Dialects" list on the
-:ref:`dialect_toplevel` page.
+:ref:`dialect_toplevel` page.
.. _mssql_identity:
@@ -1560,7 +1560,7 @@ class MSExecutionContext(default.DefaultExecutionContext):
self.cursor,
self._opt_encode(
"SET IDENTITY_INSERT %s ON"
- % self.dialect.identifier_preparer.format_table(tbl)
+ % self.identifier_preparer.format_table(tbl)
),
(),
self,
@@ -1606,7 +1606,7 @@ class MSExecutionContext(default.DefaultExecutionContext):
self.cursor,
self._opt_encode(
"SET IDENTITY_INSERT %s OFF"
- % self.dialect.identifier_preparer.format_table(
+ % self.identifier_preparer.format_table(
self.compiled.statement.table
)
),
@@ -1630,7 +1630,7 @@ class MSExecutionContext(default.DefaultExecutionContext):
self.cursor.execute(
self._opt_encode(
"SET IDENTITY_INSERT %s OFF"
- % self.dialect.identifier_preparer.format_table(
+ % self.identifier_preparer.format_table(
self.compiled.statement.table
)
)
@@ -1650,7 +1650,7 @@ class MSExecutionContext(default.DefaultExecutionContext):
return self._execute_scalar(
(
"SELECT NEXT VALUE FOR %s"
- % self.dialect.identifier_preparer.format_sequence(seq)
+ % self.identifier_preparer.format_sequence(seq)
),
type_,
)
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 063f750fa..c80ff3f19 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -988,9 +988,13 @@ from ...types import BLOB
from ...types import BOOLEAN
from ...types import DATE
from ...types import VARBINARY
+from ...util import compat
from ...util import topological
+if compat.TYPE_CHECKING:
+ from typing import Any
+
RESERVED_WORDS = set(
[
"accessible",
@@ -1394,7 +1398,7 @@ class MySQLExecutionContext(default.DefaultExecutionContext):
return self._execute_scalar(
(
"select nextval(%s)"
- % self.dialect.identifier_preparer.format_sequence(seq)
+ % self.identifier_preparer.format_sequence(seq)
),
type_,
)
@@ -3263,6 +3267,7 @@ class MySQLDialect(default.DefaultDialect):
return parser.parse(sql, charset)
def _detect_charset(self, connection):
+ # type: (Any) -> str
raise NotImplementedError()
def _detect_casing(self, connection):
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index 9344abeee..f9805abeb 100644
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -1012,9 +1012,7 @@ class OracleCompiler(compiler.SQLCompiler):
return self.process(vc.column, **kw) + "(+)"
def visit_sequence(self, seq, **kw):
- return (
- self.dialect.identifier_preparer.format_sequence(seq) + ".nextval"
- )
+ return self.preparer.format_sequence(seq) + ".nextval"
def get_render_as_alias_suffix(self, alias_name_text):
"""Oracle doesn't like ``FROM table AS alias``"""
@@ -1441,7 +1439,7 @@ class OracleExecutionContext(default.DefaultExecutionContext):
def fire_sequence(self, seq, type_):
return self._execute_scalar(
"SELECT "
- + self.dialect.identifier_preparer.format_sequence(seq)
+ + self.identifier_preparer.format_sequence(seq)
+ ".nextval FROM DUAL",
type_,
)
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py
index f067e6537..7e821acde 100644
--- a/lib/sqlalchemy/dialects/postgresql/base.py
+++ b/lib/sqlalchemy/dialects/postgresql/base.py
@@ -2936,7 +2936,7 @@ class PGExecutionContext(default.DefaultExecutionContext):
return self._execute_scalar(
(
"select nextval('%s')"
- % self.dialect.identifier_preparer.format_sequence(seq)
+ % self.identifier_preparer.format_sequence(seq)
),
type_,
)