@dbml/core 3.11.0-alpha-0 → 3.11.0

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

@@ -9,7 +9,6 @@ var _lodash = require("lodash");
 var _PostgreSQLParserVisitor = _interopRequireDefault(require("../../parsers/postgresql/PostgreSQLParserVisitor"));
 var _AST = require("../AST");
 var _constants = require("../constants");
-var _utils = require("../../../../model_structure/utils");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -70,8 +69,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       enums: [],
       tableGroups: [],
       aliases: [],
-      project: {},
-      records: {}
+      project: {}
     };
     return _this;
   }
@@ -131,10 +129,6 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
         ctx.definestmt().accept(this);
         return;
       }
-      if (ctx.insertstmt()) {
-        ctx.insertstmt().accept(this);
-        return;
-      }
     }
 
     /*
@@ -244,7 +238,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
           })
           // value: {
           //   type: 'PrimaryKey',
-          //   columns:
+          //   columns: 
           // },
         };
       }
@@ -641,7 +635,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       });
     }
 
-    // DOT (attr_name | STAR)
+    // DOT (attr_name | STAR) 
     // | OPEN_BRACKET (a_expr | opt_slice_bound COLON opt_slice_bound) CLOSE_BRACKET
   }, {
     key: "visitIndirection_el",
@@ -836,7 +830,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       }
     }
 
-    // name |
+    // name | 
   }, {
     key: "visitOpt_index_name",
     value: function visitOpt_index_name(ctx) {
@@ -851,7 +845,7 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
       return ctx.colid().accept(this);
     }
 
-    // USING name |
+    // USING name | 
   }, {
     key: "visitAccess_method_clause",
     value: function visitAccess_method_clause(ctx) {
@@ -1167,231 +1161,6 @@ var PostgresASTGen = /*#__PURE__*/function (_PostgreSQLParserVisi) {
         return s.accept(_this11);
       });
     }
-
-    // insertstmt
-    //  : opt_with_clause INSERT INTO insert_target insert_rest opt_on_conflict returning_clause
-    //  ;
-  }, {
-    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;
-      var fullTableName = (0, _utils.getFullTableName)(schemaName, tableName);
-      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));
-    }
-  }, {
-    key: "visitInsert_target",
-    value: function visitInsert_target(ctx) {
-      return ctx.qualified_name().accept(this);
-    }
-
-    // insert_rest
-    //  : selectstmt
-    //  | OVERRIDING override_kind VALUE_P selectstmt
-    //  | OPEN_PAREN insert_column_list CLOSE_PAREN (OVERRIDING override_kind VALUE_P)? selectstmt
-    //  | DEFAULT VALUES
-    //  ;
-  }, {
-    key: "visitInsert_rest",
-    value: function visitInsert_rest(ctx) {
-      var columns = ctx.insert_column_list() ? ctx.insert_column_list().accept(this) : [];
-      var rowsValue = ctx.selectstmt().accept(this) || [];
-      // each sub array represents a set of value of a row
-      // [
-      //   [
-      //     { value: '1', type: 'number' },
-      //     undefined,
-      //     {
-      //       value: '{"theme": "dark", "notifications": true}',
-      //       type: 'string',
-      //       type_name: 'JSONB',
-      //       schemaName: null
-      //     },
-      //     undefined,
-      //   ]
-      // ]
-
-      var sanitizeRowValue = function sanitizeRowValue(rowValue) {
-        return rowValue.filter(function (row) {
-          return row;
-        }).map(function (_ref) {
-          var value = _ref.value,
-            type = _ref.type;
-          return {
-            value: value,
-            type: type
-          };
-        });
-      };
-      var sanitizedRowsValue = rowsValue.filter(function (rowValue) {
-        return Array.isArray(rowValue);
-      }).map(sanitizeRowValue);
-      return {
-        columns: columns,
-        values: sanitizedRowsValue
-      };
-    }
-
-    // insert_column_list
-    //  : insert_column_item (COMMA insert_column_item)*
-    //  ;
-  }, {
-    key: "visitInsert_column_list",
-    value: function visitInsert_column_list(ctx) {
-      var _this12 = this;
-      return ctx.insert_column_item().map(function (colItem) {
-        return colItem.accept(_this12);
-      });
-    }
-
-    // insert_column_item
-    //  : colid opt_indirection
-    //  ;
-  }, {
-    key: "visitInsert_column_item",
-    value: function visitInsert_column_item(ctx) {
-      return ctx.colid().accept(this);
-    }
-
-    // selectstmt
-    //  : select_no_parens
-    //  | select_with_parens
-    //  ;
-  }, {
-    key: "visitSelectstmt",
-    value: function visitSelectstmt(ctx) {
-      if (!ctx.select_no_parens()) {
-        return null;
-      }
-      return ctx.select_no_parens().accept(this);
-    }
-
-    // select_no_parens
-    //  : select_clause opt_sort_clause (for_locking_clause opt_select_limit | select_limit opt_for_locking_clause)?
-    //  | with_clause select_clause opt_sort_clause (for_locking_clause opt_select_limit | select_limit opt_for_locking_clause)?
-    //  ;
-  }, {
-    key: "visitSelect_no_parens",
-    value: function visitSelect_no_parens(ctx) {
-      return ctx.select_clause().accept(this);
-    }
-
-    // select_clause
-    //  : simple_select
-    //  | select_with_parens
-    //  ;
-  }, {
-    key: "visitSelect_clause",
-    value: function visitSelect_clause(ctx) {
-      return ctx.simple_select().accept(this);
-    }
-
-    // simple_select
-    //  : ( SELECT (opt_all_clause into_clause opt_target_list | distinct_clause target_list)
-    //          into_clause
-    //          from_clause
-    //          where_clause
-    //          group_clause
-    //          having_clause
-    //          window_clause
-    //      | values_clause
-    //      | TABLE relation_expr
-    //      | select_with_parens set_operator_with_all_or_distinct (simple_select | select_with_parens)
-    //    )
-    //       (set_operator_with_all_or_distinct (simple_select | select_with_parens))*
-    //  ;
-  }, {
-    key: "visitSimple_select",
-    value: function visitSimple_select(ctx) {
-      if (!ctx.values_clause()) {
-        return null;
-      }
-      return ctx.values_clause().accept(this);
-    }
-
-    // values_clause
-    //  : VALUES OPEN_PAREN expr_list CLOSE_PAREN (COMMA OPEN_PAREN expr_list CLOSE_PAREN)*
-    //  ;
-  }, {
-    key: "visitValues_clause",
-    value: function visitValues_clause(ctx) {
-      var _this13 = this;
-      return ctx.expr_list().map(function (expr) {
-        var rawValues = expr.accept(_this13);
-
-        // We get the value of the c_expr through:
-        // a_expr->a_expr_qual->a_expr_lessless->a_expr_or->a_expr_and->
-        // a_expr_between->a_expr_in->a_expr_unary_not->a_expr_isnull->a_expr_is_not->
-        // a_expr_compare->a_expr_like->a_expr_qual_op->a_expr_unary_qualop->a_expr_add->
-        // a_expr_mul->a_expr_caret->a_expr_unary_sign->a_expr_at_time_zone->a_expr_collate->
-        // a_expr_typecast
-        var FLATTEN_DEPTH = 21;
-        var rawRowValues = (0, _lodash.flattenDepth)(rawValues, FLATTEN_DEPTH);
-
-        // [
-        //   { value: '1', type: 'number' },
-        //   undefined,
-        //   {
-        //     value: '{"theme": "dark", "notifications": true}',
-        //     type: 'string',
-        //     type_name: 'JSONB',
-        //     schemaName: null
-        //   },
-        //   undefined,
-        // ]
-        return rawRowValues;
-      });
-    }
-
-    // a_expr_collate
-    //  : a_expr_typecast (COLLATE any_name)?
-    //  ;
-  }, {
-    key: "visitA_expr_collate",
-    value: function visitA_expr_collate(ctx) {
-      var expressionValueSet = ctx.a_expr_typecast().accept(this);
-
-      // Possible values
-      // 1: [ { value: 'inactive', type: 'string' } ]
-      // 2: [
-      //   { value: '2021-01-05 18:45:00+00', type: 'string' },
-      //   undefined,
-      //   { type_name: 'TIMESTAMPTZ', schemaName: null }
-      // ]
-      // eslint-disable-next-line no-unused-vars
-      var _expressionValueSet = _slicedToArray(expressionValueSet, 3),
-        rawValue = _expressionValueSet[0],
-        _ = _expressionValueSet[1],
-        _expressionValueSet$ = _expressionValueSet[2],
-        rawType = _expressionValueSet$ === void 0 ? {} : _expressionValueSet$;
-      var value = rawValue.value,
-        type = rawValue.type;
-      return _objectSpread({
-        value: value,
-        type: type
-      }, rawType);
-    }
   }]);
   return PostgresASTGen;
 }(_PostgreSQLParserVisitor["default"]);

package/lib/parse/Parser.js

@@ -58,11 +58,6 @@ var Parser = /*#__PURE__*/function () {
           case 'mssql':
             rawDatabase = Parser.parseMSSQLToJSON(str);
             break;
-
-          // When we finish implementing the new parser, it should be mssql and the old one will be mssqlLegacy
-          case 'mssqlv2':
-            rawDatabase = Parser.parseMSSQLToJSONv2(str);
-            break;
           case 'json':
             if (_typeof(str) === 'object') {
               rawDatabase = str;
@@ -144,11 +139,6 @@ var Parser = /*#__PURE__*/function () {
     value: function parseMSSQLToJSON(str) {
       return _mssqlParser["default"].parseWithPegError(str);
     }
-  }, {
-    key: "parseMSSQLToJSONv2",
-    value: function parseMSSQLToJSONv2(str) {
-      return (0, _ASTGeneration.parse)(str, 'mssql');
-    }
   }, {
     key: "parseSnowflakeToJSON",
     value: function parseSnowflakeToJSON(str) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbml/core",
-  "version": "3.11.0-alpha-0",
+  "version": "3.11.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.11.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": "eb05b8cd85092e62152c6a994d9c0568a1d898de",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/database.d.ts

@@ -16,19 +16,6 @@ export interface Project {
     database_type: string;
     name: string;
 }
-
-export interface Records {
-    [tableSchemaName: string]: {
-        schemaName: string | undefined;
-        tableName: string;
-        columns: string[];
-        values: {
-            value: any;
-            type: string;
-        }[];
-    }
-}
-
 export interface RawDatabase {
     schemas: Schema[];
     tables: Table[];
@@ -37,7 +24,6 @@ export interface RawDatabase {
     refs: Ref[];
     tableGroups: TableGroup[];
     project: Project;
-    records: Records;
 }
 declare class Database extends Element {
     dbState: DbState;
@@ -49,7 +35,7 @@ declare class Database extends Element {
     databaseType: string;
     name: string;
     id: number;
-    constructor({ schemas, tables, enums, refs, tableGroups, project, records }: RawDatabase);
+    constructor({ schemas, tables, enums, refs, tableGroups, project }: RawDatabase);
     generateId(): void;
     processSchemas(rawSchemas: RawSchema[]): void;
     pushSchema(schema: Schema): void;
@@ -224,6 +210,5 @@ export interface NormalizedDatabase {
     indexes: NormalizedIndex;
     indexColumns: NormalizedIndexColumn;
     fields: NormalizedField;
-    records: Records;
 }
 export default Database;