Support *.* syntax in MySQL GRANT statements

Fixes #674
sql-formatter-org · Dec 7, 2023 · 3e0689c · 3e0689c
1 parent d34557b
commit 3e0689c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 2 deletions.
diff --git a/src/languages/mariadb/mariadb.formatter.ts b/src/languages/mariadb/mariadb.formatter.ts
@@ -293,7 +293,21 @@ export const mariadb: DialectOptions = {
     ],
     paramTypes: { positional: true },
     lineCommentTypes: ['--', '#'],
-    operators: ['%', ':=', '&', '|', '^', '~', '<<', '>>', '<=>', '&&', '||', '!'],
+    operators: [
+      '%',
+      ':=',
+      '&',
+      '|',
+      '^',
+      '~',
+      '<<',
+      '>>',
+      '<=>',
+      '&&',
+      '||',
+      '!',
+      '*.*', // Not actually an operator
+    ],
     postProcess,
   },
   formatOptions: {

diff --git a/src/languages/mysql/mysql.formatter.ts b/src/languages/mysql/mysql.formatter.ts
@@ -260,7 +260,23 @@ export const mysql: DialectOptions = {
     ],
     paramTypes: { positional: true },
     lineCommentTypes: ['--', '#'],
-    operators: ['%', ':=', '&', '|', '^', '~', '<<', '>>', '<=>', '->', '->>', '&&', '||', '!'],
+    operators: [
+      '%',
+      ':=',
+      '&',
+      '|',
+      '^',
+      '~',
+      '<<',
+      '>>',
+      '<=>',
+      '->',
+      '->>',
+      '&&',
+      '||',
+      '!',
+      '*.*', // Not actually an operator
+    ],
     postProcess,
   },
   formatOptions: {

diff --git a/src/languages/singlestoredb/singlestoredb.formatter.ts b/src/languages/singlestoredb/singlestoredb.formatter.ts
@@ -273,6 +273,7 @@ export const singlestoredb: DialectOptions = {
       '::%',
       ':>',
       '!:>',
+      '*.*', // Not actually an operator
     ],
     postProcess,
   },

diff --git a/test/behavesLikeMariaDbFormatter.ts b/test/behavesLikeMariaDbFormatter.ts
@@ -182,4 +182,11 @@ export default function behavesLikeMariaDbFormatter(format: FormatFn) {
         (1, 'Blah');
     `);
   });
+
+  // Issue #674
+  it('supports *.* syntax in GRANT statement', () => {
+    expect(format(`GRANT ALL ON *.* TO user2;`)).toBe(dedent`
+      GRANT ALL ON *.* TO user2;
+    `);
+  });
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -273,6 +273,7 @@ export const singlestoredb: DialectOptions = { @@
           '::%',
           ':>',
           '!:>',
+          '*.*', // Not actually an operator
         ],
         postProcess,
       },
@@ Expand Down @@