audrius/server-backend
1
0
Fork 0
mirror of https://github.com/OCA/server-backend.git synced 2025-02-18 09:52:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! [IMP] use sqlparse also to determine which ddl to update

Browse Source
This commit is contained in:
Holger Brunn
2022-06-22 10:23:14 +02:00
parent b76c3ed67b
commit 5046e6d000
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pglogical/hooks.py
View File

@@ -20,6 +20,7 @@ def schema_qualify(parsed_query, schema="public"):
token_iterator = parsed_query.flatten() token_iterator = parsed_query.flatten()
Name = sqlparse.tokens.Name Name = sqlparse.tokens.Name
Punctuation = sqlparse.tokens.Punctuation Punctuation = sqlparse.tokens.Punctuation
Symbol = sqlparse.tokens.String.Symbol
is_qualified = False is_qualified = False
for token in token_iterator: for token in token_iterator:
yield token yield token
@@ -39,7 +40,7 @@ def schema_qualify(parsed_query, schema="public"):
yield next_token yield next_token
if not next_token: if not next_token:
continue continue
if next_token.ttype != Name: if next_token.ttype not in (Name, Symbol):
yield next_token yield next_token
continue continue

6
pglogical/tests/test_pglogical.py
View File

@@ -124,11 +124,15 @@ class TestPglogical(TransactionCase):
RETURNS NULL ON NULL INPUT''', RETURNS NULL ON NULL INPUT''',
'drop table', 'drop table',
"alter table 'test'", "alter table 'test'",
'ALTER TABLE "testtable" ADD COLUMN "test_field" double precision',
): ):
qualified_query = ''.join( qualified_query = ''.join(
''.join(str(token) for token in schema_qualify(parsed_query)) ''.join(str(token) for token in schema_qualify(parsed_query))
for parsed_query in sqlparse.parse(statement) for parsed_query in sqlparse.parse(statement)
) )
self.assertEqual( self.assertEqual(
qualified_query, statement.replace('testtable', 'public.testtable') qualified_query,
statement.replace('testtable', 'public.testtable').replace(
'"public.testtable"', 'public."testtable"'
)
) )