orchid-orm 1.60.4 → 1.61.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Column, TableData, ColumnsShape, Query, SelectableFromShape, CreateManyMethodsNames, QueryHasWhere, RelationConfigBase, QueryManyTake, QueryManyTakeOptional, EmptyObject, CreateData, UpdateData, WhereArg, CreateMethodsNames, MaybeArray, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, AfterCommitStandaloneHook, AdapterBase, FromArg, FromResult, DbSharedOptions, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, RecordUnknown, ShallowSimplify, ComputedOptionsConfig, QueryOrExpression, QueryData, IsQuery, TableDataFn, DbTableOptionScopes, QueryScopes, ColumnSchemaConfig, StaticSQLArgs, RawSql, DynamicSQLArg, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryBeforeActionHook, QueryAfterHook, AfterHook, MergeQuery, QueryReturnType } from 'pqb';
+import { Column, TableData, ColumnsShape, Query, SelectableFromShape, CreateManyMethodsNames, QueryHasWhere, RelationConfigBase, QueryManyTake, QueryManyTakeOptional, EmptyObject, CreateData, UpdateData, WhereArg, CreateMethodsNames, MaybeArray, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, AfterCommitStandaloneHook, AdapterBase, FromArg, FromResult, DbSharedOptions, QuerySchema, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, RecordUnknown, ShallowSimplify, ComputedOptionsConfig, QueryOrExpression, QueryData, IsQuery, TableDataFn, DbTableOptionScopes, QueryScopes, ColumnSchemaConfig, DbSqlMethod, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHook, QueryBeforeActionHook, QueryAfterHook, AfterHook, MergeQuery, QueryReturnType } from 'pqb';
 export * from 'pqb';
 
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends Column.Shape.QueryInit = Column.Shape.QueryInit> {
@@ -292,7 +292,7 @@ interface OrchidORMMethods {
     $close(): Promise<void>;
 }
 type OrchidOrmParam<Options> = true | null extends true ? 'Set strict: true to tsconfig' : Options;
-declare const orchidORMWithAdapter: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, ...options }: OrchidOrmParam<({
+declare const orchidORMWithAdapter: <T extends TableClasses>({ log, logger, autoPreparedStatements, noPrimaryKey, schema, ...options }: OrchidOrmParam<({
     db: Query;
 } | {
     adapter: AdapterBase;
@@ -308,6 +308,7 @@ interface HasAndBelongsToManyOptions<Columns extends Column.Shape.QueryInit = Co
     references: string[];
     foreignKey?: boolean | TableData.References.Options;
     through: {
+        schema?: QuerySchema;
         table: string;
         columns: string[];
         references: (keyof Related['columns']['shape'])[];
@@ -442,7 +443,7 @@ interface ORMTableInput {
         shape: Column.Shape.QueryInit;
         data: MaybeArray<TableDataItem>;
     };
-    schema?: string;
+    schema?: QuerySchema;
     types: unknown;
     noPrimaryKey?: boolean;
     filePath: string;
@@ -487,7 +488,7 @@ interface BaseTableInstance<ColumnTypes> {
         shape: Column.Shape.QueryInit;
         data: MaybeArray<TableDataItem>;
     };
-    schema?: string;
+    schema?: QuerySchema;
     noPrimaryKey?: boolean;
     snakeCase?: boolean;
     types: ColumnTypes;
@@ -666,8 +667,7 @@ interface BaseTableClass<SchemaConfig extends ColumnSchemaConfig, ColumnTypes> {
     exportAs: string;
     columnTypes: ColumnTypes;
     getFilePath(): string;
-    sql<T>(...args: StaticSQLArgs): RawSql<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
-    sql<T>(...args: [DynamicSQLArg<Column.Pick.QueryColumnOfType<T>>]): DynamicRawSQL<Column.Pick.QueryColumnOfType<T>, ColumnTypes>;
+    sql: DbSqlMethod<ColumnTypes>;
     new (): BaseTableInstance<ColumnTypes>;
     instance(): BaseTableInstance<ColumnTypes>;
     /**

package/dist/index.js

@@ -29,11 +29,6 @@ function createBaseTable({
       this.q = {};
       this.language = language;
     }
-    static sql(...args) {
-      const sql = pqb.raw(...args);
-      sql.columnTypes = columnTypes;
-      return sql;
-    }
     static inputSchema() {
       this.instance();
       return this._inputSchema === void 0 ? this._inputSchema = schemaConfig.inputSchema.call(this) : this._inputSchema;
@@ -138,7 +133,7 @@ function createBaseTable({
         options
       };
     }
-  }, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a.columnTypes = columnTypes, _a);
+  }, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a.columnTypes = columnTypes, _a.sql = pqb._createDbSqlMethod(columnTypes), _a);
   pqb.applyMixins(base, [pqb.QueryHooks]);
   base.prototype.types = columnTypes;
   base.prototype.snakeCase = snakeCase;
@@ -1309,7 +1304,7 @@ const removeColumnName = (column) => {
   cloned.data = { ...column.data, name: void 0 };
   return cloned;
 };
-const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relationName, query) => {
+const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relationName, query, schema) => {
   const { options } = relation;
   const { snakeCase } = table.internal;
   const primaryKeys = options.columns;
@@ -1358,6 +1353,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
   baseQuery.shape = shape;
   baseQuery.q = {
     ...baseQuery.q,
+    schema: options.through.schema || schema,
     shape: baseQuery.shape
   };
   const subQuery = Object.create(baseQuery);
@@ -1838,7 +1834,7 @@ const nestedUpdate = (state) => {
   };
 };
 
-const applyRelations = (qb, tables, result) => {
+const applyRelations = (qb, tables, result, schema) => {
   const tableEntries = Object.entries(tables);
   const delayedRelations = /* @__PURE__ */ new Map();
   for (const name in tables) {
@@ -1888,7 +1884,7 @@ const applyRelations = (qb, tables, result) => {
           continue;
         }
       }
-      applyRelation(table, qb, data, delayedRelations);
+      applyRelation(table, qb, data, delayedRelations, schema);
     }
   }
   if (delayedRelations.size) {
@@ -1924,7 +1920,7 @@ const delayRelation = (delayedRelations, table, relationName, data) => {
     tableRelations[relationName] = [data];
   }
 };
-const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations) => {
+const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations, schema) => {
   const baseQuery = Object.create(otherDbTable);
   baseQuery.baseQuery = baseQuery;
   const query = baseQuery.as(relationName);
@@ -1949,7 +1945,8 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
       qb,
       relation,
       relationName,
-      query
+      query,
+      schema
     );
   } else {
     throw new Error(`Unknown relation type ${type}`);
@@ -1988,7 +1985,7 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
   const tableRelations = delayedRelations.get(dbTable);
   if (!tableRelations) return;
   tableRelations[relationName]?.forEach((data2) => {
-    applyRelation(table, qb, data2, delayedRelations);
+    applyRelation(table, qb, data2, delayedRelations, schema);
   });
 };
 
@@ -2013,6 +2010,7 @@ const orchidORMWithAdapter = ({
   logger,
   autoPreparedStatements,
   noPrimaryKey = "error",
+  schema,
   ...options
 }, tables) => {
   const commonOptions = {
@@ -2066,7 +2064,7 @@ const orchidORMWithAdapter = ({
     tableInstances[key] = table;
     const options2 = {
       ...commonOptions,
-      schema: table.schema,
+      schema: table.schema || schema,
       language: table.language,
       scopes: table.scopes,
       softDelete: table.softDelete,
@@ -2093,7 +2091,7 @@ const orchidORMWithAdapter = ({
     dbTable.name = table.constructor.name;
     result[key] = dbTable;
   }
-  applyRelations(qb, tableInstances, result);
+  applyRelations(qb, tableInstances, result, schema);
   for (const key in tables) {
     const table = tableInstances[key];
     if (table.init) {