Also support underscores in PostgreSQL numbers

Author: nene

src/languages/postgresql/postgresql.formatter.ts

@@ -277,6 +277,9 @@ export const postgresql: DialectOptions = {
     reservedFunctionNames: functions,
     nestedBlockComments: true,
     extraParens: ['[]'],
+    // Support underscore separators in numeric literals (e.g., 1_000_000)
+    numberRegex:
+      /(?:0x[0-9a-fA-F_]+|0b[01_]+|(?:-\s*)?(?:[0-9_]*\.[0-9_]+|[0-9_]+(?:\.[0-9_]*)?)(?:[eE][-+]?[0-9_]+(?:\.[0-9_]+)?)?)(?![\w\p{Alphabetic}])/uy,
     stringTypes: [
       '$$',
       { quote: "''-qq", prefixes: ['U&'] },

test/behavesLikeDb2Formatter.ts

@@ -19,12 +19,14 @@ import supportsMergeInto from './features/mergeInto.js';
 import supportsCreateView from './features/createView.js';
 import supportsArrayLiterals from './features/arrayLiterals.js';
 import supportsArrayAndMapAccessors from './features/arrayAndMapAccessors.js';
+import supportsNumbers from './features/numbers.js';
 
 /**
  * Shared tests for DB2 and DB2i
  */
 export default function behavesLikeDb2Formatter(format: FormatFn) {
   behavesLikeSqlFormatter(format);
+  supportsNumbers(format);
   supportsCommentOn(format);
   supportsCreateView(format, { orReplace: true });
   supportsConstraints(format, ['NO ACTION', 'RESTRICT', 'CASCADE', 'SET NULL']);

test/behavesLikeMariaDbFormatter.ts

@@ -12,12 +12,14 @@ import supportsIdentifiers from './features/identifiers.js';
 import supportsInsertInto from './features/insertInto.js';
 import supportsUpdate from './features/update.js';
 import supportsTruncateTable from './features/truncateTable.js';
+import supportsNumbers from './features/numbers.js';
 
 /**
  * Shared tests for MySQL and MariaDB
  */
 export default function behavesLikeMariaDbFormatter(format: FormatFn) {
   behavesLikeSqlFormatter(format);
+  supportsNumbers(format);
   supportsComments(format, { hashComments: true });
   supportsStrings(format, ["''-qq", "''-bs", '""-qq', '""-bs', "X''"]);
   supportsIdentifiers(format, ['``']);

test/behavesLikePostgresqlFormatter.ts

@@ -13,12 +13,14 @@ import supportsIsDistinctFrom from './features/isDistinctFrom.js';
 import supportsReturning from './features/returning.js';
 import supportsWindow from './features/window.js';
 import supportsDataTypeCase from './options/dataTypeCase.js';
+import supportsNumbers from './features/numbers.js';
 
 /**
  * Shared tests for PostgreSQL and DuckDB
  */
 export default function behavesLikePostgresqlFormatter(format: FormatFn) {
   behavesLikeSqlFormatter(format);
+  supportsNumbers(format, { underscore: true });
   supportsComments(format, { nestedBlockComments: true });
   supportsCommentOn(format);
   supportsArrayAndMapAccessors(format);

test/behavesLikeSqlFormatter.ts

@@ -3,7 +3,6 @@ import dedent from 'dedent-js';
 import { FormatFn } from '../src/sqlFormatter.js';
 
 import supportsCase from './features/case.js';
-import supportsNumbers from './features/numbers.js';
 import supportsWith from './features/with.js';
 import supportsTabWidth from './options/tabWidth.js';
 import supportsUseTabs from './options/useTabs.js';
@@ -25,7 +24,6 @@ import supportsDisableComment from './features/disableComment.js';
 export default function behavesLikeSqlFormatter(format: FormatFn) {
   supportsDisableComment(format);
   supportsCase(format);
-  supportsNumbers(format);
   supportsWith(format);
 
   supportsTabWidth(format);

test/bigquery.test.ts

@@ -25,12 +25,14 @@ import supportsCreateView from './features/createView.js';
 import supportsAlterTable from './features/alterTable.js';
 import supportsIsDistinctFrom from './features/isDistinctFrom.js';
 import supportsDataTypeCase from './options/dataTypeCase.js';
+import supportsNumbers from './features/numbers.js';
 
 describe('BigQueryFormatter', () => {
   const language = 'bigquery';
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(format);
+  supportsNumbers(format);
   supportsComments(format, { hashComments: true });
   supportsCreateView(format, { orReplace: true, materialized: true, ifNotExists: true });
   supportsCreateTable(format, { orReplace: true, ifNotExists: true });

test/duckdb.test.ts

@@ -214,15 +214,4 @@ describe('DuckDBFormatter', () => {
         1 IS NOT NULL;
     `);
   });
-
-  it('supports underscore separators in numeric literals', () => {
-    expect(format('SELECT 1_000_000, 3.14_159, 0x1A_2B_3C, 0b1010_0001, 1.5e+1_0;')).toBe(dedent`
-      SELECT
-        1_000_000,
-        3.14_159,
-        0x1A_2B_3C,
-        0b1010_0001,
-        1.5e+1_0;
-    `);
-  });
 });

test/features/numbers.ts

@@ -2,7 +2,10 @@ import dedent from 'dedent-js';
 
 import { FormatFn } from '../../src/sqlFormatter.js';
 
-export default function supportsNumbers(format: FormatFn) {
+export default function supportsNumbers(
+  format: FormatFn,
+  { underscore }: { underscore?: boolean } = {}
+) {
   it('supports decimal numbers', () => {
     const result = format('SELECT 42, -35.04, 105., 2.53E+3, 1.085E-5;');
     expect(result).toBe(dedent`
@@ -59,4 +62,17 @@ export default function supportsNumbers(format: FormatFn) {
         .456 AS foo;
     `);
   });
+
+  if (underscore) {
+    it('supports underscore separators in numeric literals', () => {
+      expect(format('SELECT 1_000_000, 3.14_159, 0x1A_2B_3C, 0b1010_0001, 1.5e+1_0;')).toBe(dedent`
+        SELECT
+          1_000_000,
+          3.14_159,
+          0x1A_2B_3C,
+          0b1010_0001,
+          1.5e+1_0;
+      `);
+    });
+  }
 }

test/hive.test.ts

@@ -23,12 +23,14 @@ import supportsTruncateTable from './features/truncateTable.js';
 import supportsMergeInto from './features/mergeInto.js';
 import supportsCreateView from './features/createView.js';
 import supportsDataTypeCase from './options/dataTypeCase.js';
+import supportsNumbers from './features/numbers.js';
 
 describe('HiveFormatter', () => {
   const language = 'hive';
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(format);
+  supportsNumbers(format);
   supportsComments(format);
   supportsCreateView(format, { materialized: true, ifNotExists: true });
   supportsCreateTable(format, { ifNotExists: true });

test/n1ql.test.ts

@@ -21,12 +21,14 @@ import supportsLimiting from './features/limiting.js';
 import supportsInsertInto from './features/insertInto.js';
 import supportsUpdate from './features/update.js';
 import supportsMergeInto from './features/mergeInto.js';
+import supportsNumbers from './features/numbers.js';
 
 describe('N1qlFormatter', () => {
   const language = 'n1ql';
   const format: FormatFn = (query, cfg = {}) => originalFormat(query, { ...cfg, language });
 
   behavesLikeSqlFormatter(format);
+  supportsNumbers(format);
   supportsComments(format, { hashComments: true });
   supportsDeleteFrom(format);
   supportsStrings(format, [`""-bs`]);