@nocobase/data-source-manager 2.2.0-beta.16 → 2.2.0-beta.17

package/lib/collection-manager.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import type { TargetKey } from '@nocobase/database';
 import { DataSource } from './data-source';
 import { CollectionOptions, ICollection, ICollectionManager, IField, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class CollectionManager implements ICollectionManager {
@@ -34,7 +35,7 @@ export declare class CollectionManager implements ICollectionManager {
     hasCollection(name: string): boolean;
     getCollection(name: string): ICollection;
     getCollections(): Array<ICollection>;
-    getRepository(name: string, sourceId?: string | number): IRepository;
+    getRepository(name: string, sourceId?: TargetKey): IRepository;
     sync(): Promise<void>;
     removeCollection(name: string): void;
     protected newCollection(options: any): ICollection;

package/lib/database-data-source.js

@@ -34,6 +34,7 @@ var import_database_introspector = require("./database-introspector/database-int
 var import_postgres_introspector = require("./database-introspector/postgres-introspector");
 var import_mariadb_introspector = require("./database-introspector/mariadb-introspector");
 var import_data_source = require("./data-source");
+const PRESERVED_LOGICAL_FIELD_TYPES_ON_SYNC = ["formula"];
 const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source.DataSource {
   createDatabaseIntrospector(db) {
     if (db.isPostgresCompatibleDialect()) {
@@ -104,7 +105,8 @@ const _DatabaseDataSource = class _DatabaseDataSource extends import_data_source
     const incomingPossibleTypes = Array.isArray(fieldOptions.possibleTypes) ? fieldOptions.possibleTypes : fieldOptions.type ? [fieldOptions.type] : [];
     const hasCompatibleStorageType = this.hasCompatibleStorageType(fieldOptions.type, modelOptions.type);
     const shouldUseIncomingType = Boolean(fieldOptions.rawType) && Boolean(modelOptions.rawType || modelOptions.type) && (modelOptions.rawType ? fieldOptions.rawType !== modelOptions.rawType && !hasCompatibleStorageType : !incomingPossibleTypes.includes(modelOptions.type) && !hasCompatibleStorageType);
-    if (shouldUseIncomingType) {
+    const shouldPreserveLogicalType = PRESERVED_LOGICAL_FIELD_TYPES_ON_SYNC.includes(modelOptions.type);
+    if (shouldUseIncomingType && !shouldPreserveLogicalType) {
       newOptions.type = fieldOptions.type;
       newOptions.interface = fieldOptions.interface;
       newOptions.rawType = fieldOptions.rawType;

package/lib/sequelize-collection-manager.d.ts

@@ -7,6 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Database } from '@nocobase/database';
+import type { TargetKey } from '@nocobase/database';
 import { DataSource } from './data-source';
 import { CollectionOptions, ICollection, ICollectionManager, IField, IFieldInterface, IRepository, MergeOptions } from './types';
 export declare class SequelizeCollectionManager implements ICollectionManager {
@@ -27,9 +28,9 @@ export declare class SequelizeCollectionManager implements ICollectionManager {
     extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): ICollection;
     hasCollection(name: string): boolean;
     getCollection(name: string): import("@nocobase/database").Collection<any, any>;
-    removeCollection(name: string): void;
+    removeCollection(name: string): import("@nocobase/database").Collection<any, any>;
     getCollections(): import("@nocobase/database").Collection<any, any>[];
-    getRepository<R = IRepository>(name: string, sourceId?: string | number): R;
+    getRepository<R = IRepository>(name: string, sourceId?: TargetKey): R;
     sync(): Promise<void>;
     registerFieldInterface(name: string, fieldInterface: new (options: any) => IFieldInterface): void;
     getFieldInterface(name: string): {

package/lib/sequelize-collection-manager.js

@@ -93,6 +93,7 @@ const _SequelizeCollectionManager = class _SequelizeCollectionManager {
     return this.db.getCollection(name);
   }
   removeCollection(name) {
+    return this.db.removeCollection(name);
   }
   getCollections() {
     const collectionsFilter = this.collectionsFilter();

package/lib/types.d.ts

@@ -6,6 +6,7 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import type { TargetKey } from '@nocobase/database';
 import { DataSource } from './data-source';
 export type DataSourceConstructor<T extends DataSource = DataSource> = Omit<typeof DataSource, 'prototype'> & {
     new (...args: any[]): T;
@@ -113,6 +114,6 @@ export interface ICollectionManager {
     getCollection(name: string): ICollection;
     getCollections(): Array<ICollection>;
     removeCollection(name: string): void;
-    getRepository(name: string, sourceId?: string | number): IRepository;
+    getRepository(name: string, sourceId?: TargetKey): IRepository;
     sync(): Promise<void>;
 }

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "2.2.0-beta.16",
+  "version": "2.2.0-beta.17",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "2.2.0-beta.16",
-    "@nocobase/cache": "2.2.0-beta.16",
-    "@nocobase/database": "2.2.0-beta.16",
-    "@nocobase/resourcer": "2.2.0-beta.16",
-    "@nocobase/utils": "2.2.0-beta.16",
+    "@nocobase/actions": "2.2.0-beta.17",
+    "@nocobase/cache": "2.2.0-beta.17",
+    "@nocobase/database": "2.2.0-beta.17",
+    "@nocobase/resourcer": "2.2.0-beta.17",
+    "@nocobase/utils": "2.2.0-beta.17",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^9.0.2"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "49d9bd2e21122eab9435f128375828b8c5bb4c07"
+  "gitHead": "d7a69c4f47fe38b17a2ce1408258902cf64f6c83"
 }