summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorTobias Pfeiffer <tgp@preferred.jp>2022-11-28 07:52:31 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2022-11-28 20:53:20 -0500
commit5cb7bf8137becbc40d12ffd4dcaf49d23913a926 (patch)
tree084a45b6017d024b4786926cacc369062f87a048 /lib/sqlalchemy
parent178620b793c00b07dc5f288fbbad83b9e448b6d2 (diff)
downloadsqlalchemy-5cb7bf8137becbc40d12ffd4dcaf49d23913a926.tar.gz
add partial index predicate to SQLiteDialect.get_indexes() result
Added support for reflection of expression-oriented WHERE criteria included in indexes on the SQLite dialect, in a manner similar to that of the PostgreSQL dialect. Pull request courtesy Tobias Pfeiffer. Fixes: #8804 Closes: #8806 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/8806 Pull-request-sha: 539dfcb372360911b69aed2a804698bb1a2220b1 Change-Id: I0e34d47dbe2b9c1da6fce531363084843e5127a3 (cherry picked from commit ed39e846cd8ae2714c47fc3d563582f72483df0c)
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py51
-rw-r--r--lib/sqlalchemy/testing/suite/test_reflection.py13
2 files changed, 58 insertions, 6 deletions
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 612d8f906..24166717a 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -821,6 +821,7 @@ from ... import exc
from ... import processors
from ... import schema as sa_schema
from ... import sql
+from ... import text
from ... import types as sqltypes
from ... import util
from ...engine import default
@@ -2474,6 +2475,21 @@ class SQLiteDialect(default.DefaultDialect):
)
indexes = []
+ # regular expression to extract the filter predicate of a partial
+ # index. this could fail to extract the predicate correctly on
+ # indexes created like
+ # CREATE INDEX i ON t (col || ') where') WHERE col <> ''
+ # but as this function does not support expression-based indexes
+ # this case does not occur.
+ partial_pred_re = re.compile(r"\)\s+where\s+(.+)", re.IGNORECASE)
+
+ if schema:
+ schema_expr = "%s." % self.identifier_preparer.quote_identifier(
+ schema
+ )
+ else:
+ schema_expr = ""
+
include_auto_indexes = kw.pop("include_auto_indexes", False)
for row in pragma_indexes:
# ignore implicit primary key index.
@@ -2482,7 +2498,38 @@ class SQLiteDialect(default.DefaultDialect):
"sqlite_autoindex"
):
continue
- indexes.append(dict(name=row[1], column_names=[], unique=row[2]))
+ indexes.append(
+ dict(
+ name=row[1],
+ column_names=[],
+ unique=row[2],
+ dialect_options={},
+ )
+ )
+
+ # check partial indexes
+ if row[4]:
+ s = (
+ "SELECT sql FROM %(schema)ssqlite_master "
+ "WHERE name = ? "
+ "AND type = 'index'" % {"schema": schema_expr}
+ )
+ rs = connection.exec_driver_sql(s, (row[1],))
+ index_sql = rs.scalar()
+ predicate_match = partial_pred_re.search(index_sql)
+ if predicate_match is None:
+ # unless the regex is broken this case shouldn't happen
+ # because we know this is a partial index, so the
+ # definition sql should match the regex
+ util.warn(
+ "Failed to look up filter predicate of "
+ "partial index %s" % row[1]
+ )
+ else:
+ predicate = predicate_match.group(1)
+ indexes[-1]["dialect_options"]["sqlite_where"] = text(
+ predicate
+ )
# loop thru unique indexes to get the column names.
for idx in list(indexes):
@@ -2500,6 +2547,8 @@ class SQLiteDialect(default.DefaultDialect):
break
else:
idx["column_names"].append(row[2])
+
+ indexes.sort(key=lambda d: d["name"] or "~") # sort None as last
return indexes
@reflection.cache
diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py
index 12949fe02..4e575046d 100644
--- a/lib/sqlalchemy/testing/suite/test_reflection.py
+++ b/lib/sqlalchemy/testing/suite/test_reflection.py
@@ -1300,8 +1300,14 @@ class ComponentReflectionTestExtra(fixtures.TestBase):
insp = inspect(connection)
expected = [
- {"name": "t_idx_2", "column_names": ["x"], "unique": False}
+ {
+ "name": "t_idx_2",
+ "column_names": ["x"],
+ "unique": False,
+ "dialect_options": {},
+ }
]
+
if testing.requires.index_reflects_included_columns.enabled:
expected[0]["include_columns"] = []
expected[0]["dialect_options"] = {
@@ -1311,10 +1317,7 @@ class ComponentReflectionTestExtra(fixtures.TestBase):
with expect_warnings(
"Skipped unsupported reflection of expression-based index t_idx"
):
- eq_(
- insp.get_indexes("t"),
- expected,
- )
+ eq_(insp.get_indexes("t"), expected)
@testing.requires.index_reflects_included_columns
def test_reflect_covering_index(self, metadata, connection):