@tstdl/base 0.92.94 → 0.92.95

package/orm/server/drizzle/schema-converter.d.ts

@@ -8,7 +8,7 @@ type ConverterContext = {
 };
 export declare const getDrizzleTableFromType: typeof _getDrizzleTableFromType;
 export declare function getColumnDefinitions(table: PgTableWithColumns<any>): ColumnDefinition[];
-export declare function _getDrizzleTableFromType<T extends EntityType, S extends string>(type: T, schemaName?: S): PgTableFromType<T, S>;
+export declare function _getDrizzleTableFromType<T extends EntityType, S extends string>(type: T, fallbackSchemaName?: S): PgTableFromType<T, S>;
 export declare function registerEnum(enumeration: Enumeration, name: string): void;
 export declare function getPgEnum(schema: string | PgSchema, enumeration: Enumeration, context?: ConverterContext): PgEnum<[string, ...string[]]>;
 export {};

package/orm/server/drizzle/schema-converter.js

@@ -25,7 +25,7 @@ const columnDefinitionsSymbol = Symbol('columnDefinitions');
 export function getColumnDefinitions(table) {
     return table[columnDefinitionsSymbol];
 }
-export function _getDrizzleTableFromType(type, schemaName) {
+export function _getDrizzleTableFromType(type, fallbackSchemaName) {
     const metadata = reflectionRegistry.getMetadata(type);
     assertDefined(metadata, `Type ${type.name} does not have reflection metadata.`);
     const tableReflectionDatas = [];
@@ -36,7 +36,7 @@ export function _getDrizzleTableFromType(type, schemaName) {
         }
     }
     const tableReflectionData = tableReflectionDatas[0];
-    const schema = assertDefinedPass(schemaName ?? tableReflectionData?.schema, 'Table schema not provided');
+    const schema = assertDefinedPass(tableReflectionData?.schema ?? fallbackSchemaName, 'Table schema not provided');
     const tableName = tableReflectionData?.name ?? getDefaultTableName(type);
     const dbSchema = getDbSchema(schema);
     const columnDefinitions = getPostgresColumnEntries(type, dbSchema, tableName);
@@ -168,7 +168,7 @@ function getPostgresColumn(tableName, columnName, dbSchema, propertySchema, refl
         column = column.primaryKey();
     }
     if (isDefined(reflectionData.references)) {
-        column = column.references(() => getDrizzleTableFromType(reflectionData.references()).id);
+        column = column.references(() => getDrizzleTableFromType(reflectionData.references(), dbSchema.schemaName).id);
     }
     return column;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.94",
+  "version": "0.92.95",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"