Skip to content

fix(deparser): keep qualified relation in LIKE and REFRESH MATERIALIZED VIEW #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
R3gardless wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(deparser): keep qualified relation in LIKE and REFRESH MATERIALIZED VIEW #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions __fixtures__/generated/generated.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21256,6 +21256,14 @@
"misc/quotes_etc-28.sql": "DO $$\nBEGIN\n RAISE NOTICE 'Line one\\nLine two';\nEND;\n$$ LANGUAGE plpgsql",
"misc/quotes_etc-29.sql": "CREATE USER MAPPING FOR local_user SERVER \"foreign_server\" OPTIONS (user 'remote_user', password 'secret123')",
"misc/quotes_etc-30.sql": "CREATE USER MAPPING FOR local_user SERVER foreign_server OPTIONS (user 'remote_user', password 'secret123')",
"misc/qualified-like-and-refresh-1.sql": "CREATE TABLE t (LIKE p)",
"misc/qualified-like-and-refresh-2.sql": "CREATE TABLE t (LIKE s.p)",
"misc/qualified-like-and-refresh-3.sql": "CREATE TABLE t (LIKE s.p INCLUDING ALL)",
"misc/qualified-like-and-refresh-4.sql": "CREATE TABLE t (LIKE db.s.p INCLUDING DEFAULTS EXCLUDING INDEXES)",
"misc/qualified-like-and-refresh-5.sql": "CREATE TABLE s.t (id int, LIKE \"My Schema\".\"My Table\" INCLUDING DEFAULTS INCLUDING CONSTRAINTS)",
"misc/qualified-like-and-refresh-6.sql": "REFRESH MATERIALIZED VIEW mv",
"misc/qualified-like-and-refresh-7.sql": "REFRESH MATERIALIZED VIEW s.mv",
"misc/qualified-like-and-refresh-8.sql": "REFRESH MATERIALIZED VIEW CONCURRENTLY db.s.mv WITH NO DATA",
"misc/pg_catalog-1.sql": "SELECT json_object('{}')",
"misc/pg_catalog-2.sql": "SELECT * FROM generate_series(1, 5)",
"misc/pg_catalog-3.sql": "SELECT get_byte(E'\\\\xDEADBEEF'::bytea, 1)",
Expand Down
9 changes: 9 additions & 0 deletions __fixtures__/kitchen-sink/misc/qualified-like-and-refresh.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
-- CREATE TABLE ... (LIKE ...) and REFRESH MATERIALIZED VIEW keep schema/catalog-qualified relations
CREATE TABLE t (LIKE p);
CREATE TABLE t (LIKE s.p);
CREATE TABLE t (LIKE s.p INCLUDING ALL);
CREATE TABLE t (LIKE db.s.p INCLUDING DEFAULTS EXCLUDING INDEXES);
CREATE TABLE s.t (id int, LIKE "My Schema"."My Table" INCLUDING DEFAULTS INCLUDING CONSTRAINTS);
REFRESH MATERIALIZED VIEW mv;
REFRESH MATERIALIZED VIEW s.mv;
REFRESH MATERIALIZED VIEW CONCURRENTLY db.s.mv WITH NO DATA;
16 changes: 16 additions & 0 deletions packages/deparser/__tests__/kitchen-sink/misc-qualified-like-and-refresh.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

import { FixtureTestUtils } from '../../test-utils';
const fixtures = new FixtureTestUtils();

it('misc-qualified-like-and-refresh', async () => {
await fixtures.runFixtureTests([
"misc/qualified-like-and-refresh-1.sql",
"misc/qualified-like-and-refresh-2.sql",
"misc/qualified-like-and-refresh-3.sql",
"misc/qualified-like-and-refresh-4.sql",
"misc/qualified-like-and-refresh-5.sql",
"misc/qualified-like-and-refresh-6.sql",
"misc/qualified-like-and-refresh-7.sql",
"misc/qualified-like-and-refresh-8.sql"
]);
});
4 changes: 2 additions & 2 deletions packages/deparser/src/deparser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10043,7 +10043,7 @@ export class Deparser implements DeparserVisitor {
}

if (node.relation) {
output.push(this.visit(node.relation as any, context));
output.push(this.RangeVar(node.relation, context));
}

if (node.skipData) {
Expand Down Expand Up @@ -11664,7 +11664,7 @@ export class Deparser implements DeparserVisitor {
const output: string[] = ['LIKE'];

if (node.relation) {
output.push(this.visit(node.relation as any, context));
output.push(this.RangeVar(node.relation, context));
}

if (node.options && typeof node.options === 'number') {
Expand Down