diff --git a/indexdigest/linters/linter_0006_not_used_columns_and_tables.py b/indexdigest/linters/linter_0006_not_used_columns_and_tables.py index aafd3dee..7763608b 100644 --- a/indexdigest/linters/linter_0006_not_used_columns_and_tables.py +++ b/indexdigest/linters/linter_0006_not_used_columns_and_tables.py @@ -4,7 +4,7 @@ import logging from collections import defaultdict, OrderedDict -from sql_metadata import get_query_columns, get_query_tables +from sql_metadata.compat import get_query_columns, get_query_tables from indexdigest.utils import LinterEntry, is_select_query diff --git a/indexdigest/linters/linter_0070_insert_ignore.py b/indexdigest/linters/linter_0070_insert_ignore.py index fc8fc008..d88abae3 100644 --- a/indexdigest/linters/linter_0070_insert_ignore.py +++ b/indexdigest/linters/linter_0070_insert_ignore.py @@ -15,7 +15,7 @@ import re from collections import OrderedDict -from sql_metadata import get_query_tables +from sql_metadata.compat import get_query_tables from indexdigest.utils import LinterEntry, shorten_query diff --git a/indexdigest/linters/linter_0092_select_star.py b/indexdigest/linters/linter_0092_select_star.py index 80b7ceea..2bde56dd 100644 --- a/indexdigest/linters/linter_0092_select_star.py +++ b/indexdigest/linters/linter_0092_select_star.py @@ -1,7 +1,8 @@ """ This linter checks for select queries with * wildcard """ -from sql_metadata import preprocess_query, get_query_tables, get_query_tokens, Wildcard +from sqlparse.tokens import Wildcard +from sql_metadata.compat import preprocess_query, get_query_tables, get_query_tokens from indexdigest.utils import LinterEntry, shorten_query, is_select_query diff --git a/indexdigest/linters/linter_0093_having_clause.py b/indexdigest/linters/linter_0093_having_clause.py index 71dd9cc0..d3ade453 100644 --- a/indexdigest/linters/linter_0093_having_clause.py +++ b/indexdigest/linters/linter_0093_having_clause.py @@ -2,7 +2,7 @@ This linter checks for select queries with HAVING clause """ from sqlparse.tokens import Keyword -from sql_metadata import preprocess_query, get_query_tables, get_query_tokens +from sql_metadata.compat import preprocess_query, get_query_tables, get_query_tokens from indexdigest.utils import LinterEntry, shorten_query, is_select_query diff --git a/indexdigest/linters/linter_0118_high_offset_selects.py b/indexdigest/linters/linter_0118_high_offset_selects.py index 7bd6b4be..6fe0f2a3 100644 --- a/indexdigest/linters/linter_0118_high_offset_selects.py +++ b/indexdigest/linters/linter_0118_high_offset_selects.py @@ -3,7 +3,7 @@ """ from collections import OrderedDict -from sql_metadata import get_query_limit_and_offset, get_query_tables +from sql_metadata.compat import get_query_limit_and_offset, get_query_tables from indexdigest.utils import LinterEntry, shorten_query, is_select_query diff --git a/indexdigest/test/core/test_query.py b/indexdigest/test/core/test_query.py index 00ecfd53..d375b394 100644 --- a/indexdigest/test/core/test_query.py +++ b/indexdigest/test/core/test_query.py @@ -1,6 +1,6 @@ from unittest import TestCase -from sql_metadata import get_query_columns, get_query_tables +from sql_metadata.compat import get_query_columns, get_query_tables class TestUtils(TestCase): diff --git a/setup.py b/setup.py index c01cb76a..9aa77699 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ 'docopt==0.6.2', 'PyYAML==5.4.1', 'mysqlclient==2.0.3', - 'sql_metadata==1.12.0', + 'sql_metadata==2.0.0', 'termcolor==1.1.0', 'yamlordereddictloader==0.4.0' ],