@dbml/core 3.11.0-alpha-0 → 3.12.0-alpha-0

package/lib/parse/ANTLR/ASTGeneration/mysql/MySQLASTGen.js

@@ -79,7 +79,7 @@ var MySQLASTGen = /*#__PURE__*/function (_MySQLParserVisitor) {
       tableGroups: [],
       aliases: [],
       project: {},
-      records: {}
+      records: []
     };
     return _this;
   }
@@ -1175,7 +1175,6 @@ var MySQLASTGen = /*#__PURE__*/function (_MySQLParserVisitor) {
   }, {
     key: "visitInsertStatement",
     value: function visitInsertStatement(ctx) {
-      var _this$data$records$fu;
       var names = ctx.tableName().accept(this);
       var tableName = (0, _lodash.last)(names);
       var schemaName = names.length > 1 ? names[names.length - 2] : undefined;
@@ -1184,18 +1183,13 @@ var MySQLASTGen = /*#__PURE__*/function (_MySQLParserVisitor) {
       // insert without specified columns
       var columns = ctx.fullColumnNameList() ? ctx.fullColumnNameList().accept(this) : [];
       var values = ctx.insertStatementValue().accept(this);
-      if (columns.length === 0 || values.length === 0) {
-        return;
-      }
-      if (!this.data.records[fullTableName]) {
-        this.data.records[fullTableName] = {
-          schemaName: schemaName,
-          tableName: tableName,
-          columns: columns,
-          values: []
-        };
-      }
-      (_this$data$records$fu = this.data.records[fullTableName].values).push.apply(_this$data$records$fu, _toConsumableArray(values));
+      var record = {
+        schemaName: schemaName,
+        tableName: tableName,
+        columns: columns,
+        values: values
+      };
+      this.data.records.push(record);
     }
 
     // fullColumnNameList

package/lib/parse/ANTLR/ASTGeneration/postgres/PostgresASTGen.js

@@ -71,7 +71,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       tableGroups: [],
       aliases: [],
       project: {},
-      records: {}
+      records: []
     };
     return _this;
   }
@@ -1174,7 +1174,6 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
   }, {
     key: "visitInsertstmt",
     value: function visitInsertstmt(ctx) {
-      var _this$data$records$fu;
       var names = ctx.insert_target().accept(this);
       var tableName = (0, _lodash.last)(names);
       var schemaName = names.length > 1 ? names[names.length - 2] : undefined;
@@ -1182,23 +1181,13 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       var _ctx$insert_rest$acce = ctx.insert_rest().accept(this),
         columns = _ctx$insert_rest$acce.columns,
         values = _ctx$insert_rest$acce.values;
-
-      // handle insert into all columns
-      if (columns.length === 0 || values.length === 0) {
-        // temporarily ignore
-        return;
-      }
-      if (!this.data.records[fullTableName]) {
-        this.data.records[fullTableName] = {
-          schemaName: schemaName,
-          tableName: tableName,
-          columns: columns,
-          values: []
-        };
-      }
-
-      // TODO: should handle case the number of columns is not equal
-      (_this$data$records$fu = this.data.records[fullTableName].values).push.apply(_this$data$records$fu, _toConsumableArray(values));
+      var record = {
+        schemaName: schemaName,
+        tableName: tableName,
+        columns: columns,
+        values: values
+      };
+      this.data.records.push(record);
     }
   }, {
     key: "visitInsert_target",

package/lib/parse/ANTLR/README.md

@@ -14,7 +14,12 @@
 - https://github.com/antlr/antlr4/blob/master/doc/javascript-target.md
 ## Setup a new parser
 1. Create a new folder inside the `packages/dbml-core/src/parse/ANTLR/parsers` folder (e.g. `postgresql`)
-2. Go to https://github.com/antlr/grammars-v4/tree/master/sql and clone the `<lang>Lexer.G4` and `<lang>Parser.G4` to the newly created folder.
+2. Get the grammar:
+
+- Go to https://github.com/antlr/grammars-v4/tree/master/sql and clone the `<lang>Lexer.G4` and `<lang>Parser.G4` to the newly created folder.
+
+- **Remember to add the original link to `<lang>Lexer.G4` and `<lang>Parser.G4`**
+
 3. Go to the folder:
     ```
     cd packages/dbml-core/src/parse/ANTLR/parsers/postgresql

package/lib/parse/ANTLR/parsers/mssql/TSqlLexer.g4

@@ -1,3 +1,9 @@
+/*
+Original: https://github.com/antlr/grammars-v4/blob/master/sql/tsql/TSqlLexer.g4
+Last updated: 2024-05-01
+*/
+
+
 /*
 T-SQL (Transact-SQL, MSSQL) grammar.
 The MIT License (MIT).

package/lib/parse/ANTLR/parsers/mssql/TSqlParser.g4

@@ -1,3 +1,9 @@
+/*
+Original: https://github.com/antlr/grammars-v4/blob/master/sql/tsql/TSqlParser.g4
+Last updated: 2024-04-14
+References: https://infocenter.sybase.com/help/topic/com.sybase.dc36272_1251/pdf/commands.pdf
+*/
+
 /*
 T-SQL (Transact-SQL, MSSQL) grammar.
 The MIT License (MIT).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.11.0-alpha-0",
+  "version": "3.12.0-alpha-0",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -32,7 +32,7 @@
     "prepublish": "npm run build"
   },
   "dependencies": {
-    "@dbml/parse": "^3.11.0-alpha-0",
+    "@dbml/parse": "^3.12.0-alpha-0",
     "antlr4": "^4.13.1",
     "lodash": "^4.17.15",
     "parsimmon": "^1.13.0",
@@ -59,7 +59,7 @@
       "\\.(?!json$)[^.]*$": "@glen/jest-raw-loader"
     }
   },
-  "gitHead": "b090782ba29b03837d87d4d6478bd3f2ca403efc",
+  "gitHead": "da2bec56f10f32db65a06856105f08b522556661",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/database.d.ts

@@ -17,16 +17,22 @@ export interface Project {
     name: string;
 }
 
-export interface Records {
-    [tableSchemaName: string]: {
-        schemaName: string | undefined;
-        tableName: string;
-        columns: string[];
-        values: {
-            value: any;
-            type: string;
-        }[];
-    }
+interface RawRecord {
+    schemaName: string | undefined;
+    tableName: string;
+    columns: string[];
+    values: {
+        value: any;
+        type: string;
+    }[][];
+}
+
+export interface Record extends RawRecord {
+    id: number;
+}
+
+export interface NormalizedRecord {
+    [_id: number]: Record;
 }
 
 export interface RawDatabase {
@@ -37,7 +43,7 @@ export interface RawDatabase {
     refs: Ref[];
     tableGroups: TableGroup[];
     project: Project;
-    records: Records;
+    records: RawRecord[];
 }
 declare class Database extends Element {
     dbState: DbState;
@@ -48,9 +54,11 @@ declare class Database extends Element {
     noteToken: Token;
     databaseType: string;
     name: string;
+    records: Record[];
     id: number;
     constructor({ schemas, tables, enums, refs, tableGroups, project, records }: RawDatabase);
     generateId(): void;
+    processRecords(rawRecords: RawRecord[]): void;
     processSchemas(rawSchemas: RawSchema[]): void;
     pushSchema(schema: Schema): void;
     checkSchema(schema: Schema): void;
@@ -122,6 +130,16 @@ declare class Database extends Element {
             content: string;
             headerColor: string;
         }[];
+        records: {
+            id: number;
+            schemaName: string;
+            tableName: string;
+            columns: string[];
+            values: {
+                value: any;
+                type: string;
+            }[][];
+        }[];
     };
     shallowExport(): {
         hasDefaultSchema: boolean;
@@ -224,6 +242,6 @@ export interface NormalizedDatabase {
     indexes: NormalizedIndex;
     indexColumns: NormalizedIndexColumn;
     fields: NormalizedField;
-    records: Records;
+    records: NormalizedRecord;
 }
 export default Database;

package/types/parse/Parser.d.ts

@@ -18,7 +18,7 @@ declare class Parser {
     static parsePostgresToJSON(str: string): RawDatabase;
     static parsePostgresToJSONv2(str: string): RawDatabase;
     static parseDBMLToJSON(str: string): RawDatabase;
-    static parseDBMLToJSONv2(str: string, dbmlCompiler: Compiler): RawDatabase;
+    static parseDBMLToJSONv2(str: string, dbmlCompiler?: Compiler): RawDatabase;
     static parseSchemaRbToJSON(str: string): RawDatabase;
     static parseMSSQLToJSON(str: string): RawDatabase;
     static parseMSSQLToJSONv2(str: string): RawDatabase;