@nocobase/database 1.0.0-alpha.13 → 1.0.0-alpha.15

package/lib/collection.js

@@ -240,7 +240,7 @@ const _Collection = class _Collection extends import_events.EventEmitter {
     (0, import_utils.checkIdentifier)(name);
     this.checkFieldType(name, options);
     const { database } = this.context;
-    database.logger.debug(`beforeSetField: ${(0, import_safe_json_stringify.default)(options)}`, {
+    database.logger.trace(`beforeSetField: ${(0, import_safe_json_stringify.default)(options)}`, {
       databaseInstanceId: database.instanceId,
       collectionName: this.name,
       fieldName: name

package/lib/database.js

@@ -73,7 +73,6 @@ var import_migration = require("./migration");
 var import_model_hook = require("./model-hook");
 var import_operators = __toESM(require("./operators"));
 var import_query_interface_builder = __toESM(require("./query-interface/query-interface-builder"));
-var import_sql_collection = require("./sql-collection/sql-collection");
 var import_utils2 = require("./utils");
 var import_value_parsers = require("./value-parsers");
 var import_view_collection = require("./view-collection");
@@ -415,7 +414,7 @@ const _Database = class _Database extends import_events.EventEmitter {
     if (this.options.underscored) {
       options.underscored = true;
     }
-    this.logger.debug(`beforeDefineCollection: ${(0, import_safe_json_stringify.default)(options)}`, {
+    this.logger.trace(`beforeDefineCollection: ${(0, import_safe_json_stringify.default)(options)}`, {
       databaseInstanceId: this.instanceId
     });
     this.emit("beforeDefineCollection", options);
@@ -759,17 +758,6 @@ const _Database = class _Database extends import_events.EventEmitter {
         return;
       }
     });
-    this.collectionFactory.registerCollectionType(import_sql_collection.SqlCollection, {
-      condition: (options) => {
-        return options.sql;
-      },
-      async onSync() {
-        return;
-      },
-      async onDump(dumper, collection) {
-        return;
-      }
-    });
   }
 };
 __name(_Database, "Database");

package/lib/index.d.ts

@@ -32,5 +32,5 @@ export { snakeCase } from './utils';
 export * from './value-parsers';
 export * from './view-collection';
 export * from './view/view-inference';
-export * from './sql-collection';
 export * from './helpers';
+export { default as sqlParser, SQLParserTypes } from './sql-parser';

package/lib/index.js

@@ -46,6 +46,7 @@ __export(src_exports, {
   HasManyGetAssociationsMixin: () => import_sequelize.HasManyGetAssociationsMixin,
   ModelStatic: () => import_sequelize.ModelStatic,
   Op: () => import_sequelize.Op,
+  SQLParserTypes: () => import_sql_parser.SQLParserTypes,
   SyncOptions: () => import_sequelize.SyncOptions,
   Transaction: () => import_sequelize.Transaction,
   UniqueConstraintError: () => import_sequelize.UniqueConstraintError,
@@ -55,6 +56,7 @@ __export(src_exports, {
   fn: () => import_sequelize.fn,
   literal: () => import_sequelize.literal,
   snakeCase: () => import_utils.snakeCase,
+  sqlParser: () => import_sql_parser.default,
   where: () => import_sequelize.where
 });
 module.exports = __toCommonJS(src_exports);
@@ -84,8 +86,8 @@ var import_utils = require("./utils");
 __reExport(src_exports, require("./value-parsers"), module.exports);
 __reExport(src_exports, require("./view-collection"), module.exports);
 __reExport(src_exports, require("./view/view-inference"), module.exports);
-__reExport(src_exports, require("./sql-collection"), module.exports);
 __reExport(src_exports, require("./helpers"), module.exports);
+var import_sql_parser = __toESM(require("./sql-parser"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   BaseError,
@@ -97,6 +99,7 @@ __reExport(src_exports, require("./helpers"), module.exports);
   HasManyGetAssociationsMixin,
   ModelStatic,
   Op,
+  SQLParserTypes,
   SyncOptions,
   Transaction,
   UniqueConstraintError,
@@ -105,6 +108,7 @@ __reExport(src_exports, require("./helpers"), module.exports);
   fn,
   literal,
   snakeCase,
+  sqlParser,
   where,
   ...require("./collection"),
   ...require("./collection-group-manager"),
@@ -128,6 +132,5 @@ __reExport(src_exports, require("./helpers"), module.exports);
   ...require("./value-parsers"),
   ...require("./view-collection"),
   ...require("./view/view-inference"),
-  ...require("./sql-collection"),
   ...require("./helpers")
 });

package/lib/operators/array.js

@@ -61,13 +61,15 @@ const getFieldName = /* @__PURE__ */ __name((ctx) => {
     return model2;
   }, "getModelFromAssociationPath");
   const model = getModelFromAssociationPath();
+  let columnPrefix = model.name;
   if (model.rawAttributes[fieldName]) {
     columnName = model.rawAttributes[fieldName].field || fieldName;
   }
   if (associationPath.length > 0) {
     const association = associationPath.join("->");
-    columnName = `${association}.${columnName}`;
+    columnPrefix = association;
   }
+  columnName = `${columnPrefix}.${columnName}`;
   return columnName;
 }, "getFieldName");
 const escape = /* @__PURE__ */ __name((value, ctx) => {

package/lib/query-interface/postgres-query-interface.js

@@ -41,7 +41,7 @@ __export(postgres_query_interface_exports, {
 });
 module.exports = __toCommonJS(postgres_query_interface_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_postgres = __toESM(require("../sql-parser/postgres"));
+var import_sql_parser = __toESM(require("../sql-parser"));
 var import_query_interface = __toESM(require("./query-interface"));
 const _PostgresQueryInterface = class _PostgresQueryInterface extends import_query_interface.default {
   constructor(db) {
@@ -123,7 +123,9 @@ const _PostgresQueryInterface = class _PostgresQueryInterface extends import_que
     return import_lodash.default.trim(viewDefQuery[0]["definition"]);
   }
   parseSQL(sql) {
-    return import_postgres.default.parse(sql);
+    return import_sql_parser.default.parse(sql, {
+      database: "Postgresql"
+    });
   }
   async viewColumnUsage(options) {
     const { viewName, schema = "public" } = options;

package/lib/repository.js

@@ -119,35 +119,37 @@ const _Repository = class _Repository {
     this.collection = collection;
     this.model = collection.model;
   }
-  static valuesToFilter(values, filterKeys) {
-    const filterAnd = [];
-    const flattedValues = (0, import_flat.flatten)(values);
-    const keyWithOutArrayIndex = /* @__PURE__ */ __name((key) => {
+  static valuesToFilter(values = {}, filterKeys) {
+    const removeArrayIndexInKey = /* @__PURE__ */ __name((key) => {
       const chunks = key.split(".");
       return chunks.filter((chunk) => {
         return !chunk.match(/\d+/);
       }).join(".");
-    }, "keyWithOutArrayIndex");
-    for (const filterKey of filterKeys) {
-      let filterValue;
-      for (const flattedKey of Object.keys(flattedValues)) {
-        const flattedKeyWithoutIndex = keyWithOutArrayIndex(flattedKey);
-        if (flattedKeyWithoutIndex === filterKey) {
-          if (filterValue) {
-            if (Array.isArray(filterValue)) {
-              filterValue.push(flattedValues[flattedKey]);
-            } else {
-              filterValue = [filterValue, flattedValues[flattedKey]];
-            }
-          } else {
-            filterValue = flattedValues[flattedKey];
-          }
+    }, "removeArrayIndexInKey");
+    const filterAnd = [];
+    const flattedValues = (0, import_flat.flatten)(values);
+    const flattedValuesObject = {};
+    for (const key in flattedValues) {
+      const keyWithoutArrayIndex = removeArrayIndexInKey(key);
+      if (flattedValuesObject[keyWithoutArrayIndex]) {
+        if (!Array.isArray(flattedValuesObject[keyWithoutArrayIndex])) {
+          flattedValuesObject[keyWithoutArrayIndex] = [flattedValuesObject[keyWithoutArrayIndex]];
         }
+        flattedValuesObject[keyWithoutArrayIndex].push(flattedValues[key]);
+      } else {
+        flattedValuesObject[keyWithoutArrayIndex] = [flattedValues[key]];
       }
+    }
+    for (const filterKey of filterKeys) {
+      const filterValue = flattedValuesObject[filterKey] ? flattedValuesObject[filterKey] : import_lodash.default.get(values, filterKey);
       if (filterValue) {
         filterAnd.push({
           [filterKey]: filterValue
         });
+      } else {
+        filterAnd.push({
+          [filterKey]: null
+        });
       }
     }
     return {

package/lib/{sql-collection → sql-parser}/index.d.ts

@@ -6,5 +6,8 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export * from './sql-model';
-export * from './sql-collection';
+import { Parser } from 'node-sql-parser';
+import type * as SQLParserTypes from 'node-sql-parser';
+declare const _default: Parser;
+export default _default;
+export type { SQLParserTypes };