Merge pull request #149 from launchql/fix/issues-47

updates for #127

Author: pyramation

CLI.md

@@ -21095,6 +21095,7 @@
   "misc/issues-9.sql": "CREATE TABLE \"Album\"\n(\n  \"AlbumId\" INT NOT NULL,\n  \"Title\" VARCHAR(160) NOT NULL,\n  \"ArtistId\" INT NOT NULL,\n  CONSTRAINT \"PK_Album\" PRIMARY KEY  (\"AlbumId\")\n)",
   "misc/issues-10.sql": "CREATE INDEX \"existing_undispatched_message\" ON public.messages USING btree (\"context_id\", context_type, notification_name, \"to\", user_id)",
   "misc/issues-11.sql": "COMMENT ON COLUMN \"foo\".\"whatever\" IS $$\nSomething blah, this data may have chars like '\\n' and '\\r' in it.\n$$",
+  "misc/issues-12.sql": "SELECT * from foo.bar.baz",
   "misc/inflection-1.sql": "CREATE SCHEMA inflection",
   "misc/inflection-2.sql": "GRANT USAGE ON SCHEMA inflection TO PUBLIC",
   "misc/inflection-3.sql": "ALTER DEFAULT PRIVILEGES IN SCHEMA inflection \n GRANT EXECUTE ON FUNCTIONS  TO PUBLIC",

__fixtures__/generated/generated.json

@@ -54,3 +54,6 @@ CREATE INDEX "existing_undispatched_message" ON public.messages USING btree ("co
 COMMENT ON COLUMN "foo"."whatever" IS $$
 Something blah, this data may have chars like '\n' and '\r' in it.
 $$;
+
+-- https://github.com/launchql/pgsql-parser/issues/127
+SELECT * from foo.bar.baz;

__fixtures__/kitchen-sink/misc/issues.sql

@@ -14,6 +14,7 @@ it('misc-issues', async () => {
   "misc/issues-8.sql",
   "misc/issues-9.sql",
   "misc/issues-10.sql",
-  "misc/issues-11.sql"
+  "misc/issues-11.sql",
+  "misc/issues-12.sql"
 ]);
 });

packages/deparser/__tests__/kitchen-sink/misc-issues.test.ts

@@ -1577,7 +1577,13 @@ export class Deparser implements DeparserVisitor {
     }
 
     let tableName = '';
-    if (node.schemaname) {
+    if (node.catalogname) {
+      tableName = QuoteUtils.quote(node.catalogname);
+      if (node.schemaname) {
+        tableName += '.' + QuoteUtils.quote(node.schemaname);
+      }
+      tableName += '.' + QuoteUtils.quote(node.relname);
+    } else if (node.schemaname) {
       tableName = QuoteUtils.quote(node.schemaname) + '.' + QuoteUtils.quote(node.relname);
     } else {
       tableName = QuoteUtils.quote(node.relname);