CLI: Add --postgres-legacy to import postgres with old parser.

holistics · Aug 24, 2023 · c6667b0 · c6667b0
1 parent 1e576b2
commit c6667b0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/packages/dbml-cli/src/cli/index.js b/packages/dbml-cli/src/cli/index.js
@@ -26,6 +26,7 @@ function sql2dbml (args) {
     .usage('[options] <files...>')
     .option('--mysql')
     .option('--postgres')
+    .option('--postgres-legacy')
     .option('--mssql')
     .option('-o, --out-file <pathspec>', 'compile all input files into a single files');
   // .option('-d, --out-dir <pathspec>', 'compile an input directory of sql files into an output directory');

diff --git a/packages/dbml-cli/src/cli/utils.js b/packages/dbml-cli/src/cli/utils.js
@@ -15,7 +15,7 @@ function validateInputFilePaths (paths, validatePlugin) {
 
 function getFormatOpt (opts) {
   const formatOpts = Object.keys(opts).filter((opt) => {
-    return opt === 'postgres' || opt === 'mysql' || opt === 'mssql';
+    return ['postgres', 'mysql', 'mssql', 'postgresLegacy'].includes(opt);
   });
 
   let format = 'postgres';

diff --git a/packages/dbml-core/__tests__/parser/parser.spec.js b/packages/dbml-core/__tests__/parser/parser.spec.js
@@ -25,7 +25,7 @@ describe('@dbml/core', () => {
     });
 
     test.each(scanTestNames(__dirname, 'postgres-parse/input'))('postgres-parse/%s', (name) => {
-      runTest(name, 'postgres-parse', 'postgres', 'parsePostgresToJSON');
+      runTest(name, 'postgres-parse', 'postgres', 'parsePostgresToJSONv2');
     });
 
     test.each(scanTestNames(__dirname, 'schemarb-parse/input'))('schemarb-parse/%s', (name) => {

diff --git a/packages/dbml-core/src/parse/Parser.js b/packages/dbml-core/src/parse/Parser.js
@@ -1,5 +1,6 @@
 import Database from '../model_structure/database';
 import mysqlParser from './mysqlParser';
+import postgresParser from './postgresParser';
 import dbmlParser from './dbmlParser';
 import schemarbParser from './schemarbParser';
 import mssqlParser from './mssqlParser';
@@ -15,10 +16,14 @@ class Parser {
     return mysqlParser.parse(str);
   }
 
-  static parsePostgresToJSON (str) {
+  static parsePostgresToJSONv2 (str) {
     return parse(str, 'postgres');
   }
 
+  static parsePostgresToJSON (str) {
+    return postgresParser.parse(str);
+  }
+
   static parseDBMLToJSON (str) {
     return dbmlParser.parse(str);
   }
@@ -39,6 +44,10 @@ class Parser {
         break;
 
       case 'postgres':
+        rawDatabase = Parser.parsePostgresToJSONv2(str);
+        break;
+
+      case 'postgresLegacy':
         rawDatabase = Parser.parsePostgresToJSON(str);
         break;
 

diff --git a/packages/dbml-core/types/import/index.d.ts b/packages/dbml-core/types/import/index.d.ts
@@ -1,4 +1,4 @@
-declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql'): string;
+declare function _import(str: string, format: 'dbml' | 'mysql' | 'postgres' | 'json' | 'mssql' | 'postgresLegacy'): string;
 declare const _default: {
     import: typeof _import;
 };

diff --git a/packages/dbml-core/types/parse/Parser.d.ts b/packages/dbml-core/types/parse/Parser.d.ts
@@ -3,6 +3,7 @@ declare class Parser {
     static parseJSONToDatabase(rawDatabase: RawDatabase): Database;
     static parseMySQLToJSON(str: string): RawDatabase;
     static parsePostgresToJSON(str: string): RawDatabase;
+    static parsePostgresToJSONv2(str: string): RawDatabase;
     static parseDBMLToJSON(str: string): RawDatabase;
     static parseSchemaRbToJSON(str: string): RawDatabase;
     static parseMSSQLToJSON(str: string): RawDatabase;