orchid-orm 1.72.7 → 1.72.8

package/dist/bun.d.ts

@@ -1,17 +1,24 @@
 import * as _$pqb_internal0 from "pqb/internal";
-import { DbSharedOptions } from "pqb/internal";
+import { DbSharedOptions, EmptyObject } from "pqb/internal";
 import * as _$pqb_bun0 from "pqb/bun";
 import { BunAdapterOptions, bunSchemaConfig } from "pqb/bun";
-import { OrchidORM, OrchidORMTables, OrchidOrmParam, TableClasses } from "orchid-orm";
-interface BunOrchidORMOptions extends BunAdapterOptions, DbSharedOptions {}
+import { OrchidORM, OrchidORMBundle, OrchidOrmParam, TableClasses } from "orchid-orm";
+interface BunOrchidORMOptions extends BunAdapterOptions, DbSharedOptions {
+  views?: TableClasses;
+}
 declare const Adapter: _$pqb_internal0.DriverAdapter;
 declare const createDb: <SchemaConfig extends _$pqb_internal0.ColumnSchemaConfig = _$pqb_internal0.DefaultSchemaConfig, ColumnTypes = _$pqb_internal0.DefaultColumnTypes<SchemaConfig>>({
   log,
   ...options
 }: _$pqb_bun0.CreateBunDbOptions<SchemaConfig, ColumnTypes>) => _$pqb_internal0.DbResult<ColumnTypes>;
-declare const makeOrchidOrmDb: <T extends TableClasses>(orm: OrchidORMTables<T>, {
+declare const makeOrchidOrmDb: <T extends TableClasses, V extends TableClasses = EmptyObject>(orm: OrchidORMBundle<T, V>, {
   log,
   ...options
-}: OrchidOrmParam<BunOrchidORMOptions>) => OrchidORM<T>;
-declare const orchidORM: <T extends TableClasses>(options: OrchidOrmParam<BunOrchidORMOptions>, tables: T) => OrchidORM<T>;
+}: OrchidOrmParam<BunOrchidORMOptions>) => OrchidORM<T, V>;
+declare const orchidORM: <T extends TableClasses, V extends TableClasses = EmptyObject>({
+  views,
+  ...options
+}: OrchidOrmParam<BunOrchidORMOptions & {
+  views?: V;
+}>, tables: T) => OrchidORM<T, V>;
 export { Adapter, BunOrchidORMOptions, bunSchemaConfig, createDb, makeOrchidOrmDb, orchidORM };

package/dist/bun.js

@@ -14,8 +14,11 @@ const makeOrchidOrmDb = (orm, { log, ...options }) => {
 		})
 	});
 };
-const orchidORM = (options, tables) => {
-	return makeOrchidOrmDb((0, orchid_orm.bundleOrchidORMTables)(tables), options);
+const orchidORM = ({ views, ...options }, tables) => {
+	return makeOrchidOrmDb((0, orchid_orm.bundleOrchidORM)({
+		tables,
+		views
+	}), options);
 };
 exports.Adapter = Adapter;
 Object.defineProperty(exports, "bunSchemaConfig", {

package/dist/bun.js.map

@@ -1 +1 @@
-{"version":3,"file":"bun.js","names":["BunAdapter","cdb","AdapterClass"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<BunOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAeA,MAAa,UAAUA,QAAAA;AAEvB,MAAa,WAAWC,QAAAA;AAExB,MAAa,mBACX,KACA,EAAE,KAAK,GAAG,cACO;AACjB,SAAA,GAAA,WAAA,4BAAkC,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,QAAAA;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,iBAAA,GAAA,WAAA,uBAD2B,OAAO,EACb,QAAQ"}
+{"version":3,"file":"bun.js","names":["BunAdapter","cdb","AdapterClass"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMBundle,\n  OrchidOrmParam,\n  bundleOrchidORM,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass, EmptyObject } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {\n  views?: TableClasses;\n}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <\n  T extends TableClasses,\n  V extends TableClasses = EmptyObject,\n>(\n  orm: OrchidORMBundle<T, V>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T, V> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <\n  T extends TableClasses,\n  V extends TableClasses = EmptyObject,\n>(\n  { views, ...options }: OrchidOrmParam<BunOrchidORMOptions & { views?: V }>,\n  tables: T,\n): OrchidORM<T, V> => {\n  const orm = bundleOrchidORM({ tables, views });\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;;AAiBA,MAAa,UAAUA,QAAAA;AAEvB,MAAa,WAAWC,QAAAA;AAExB,MAAa,mBAIX,KACA,EAAE,KAAK,GAAG,cACU;AACpB,SAAA,GAAA,WAAA,4BAAkC,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAIC,aAAAA,aAAa;GACxB,eAAeF,QAAAA;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aAIX,EAAE,OAAO,GAAG,WACZ,WACoB;AAEpB,QAAO,iBAAA,GAAA,WAAA,iBADqB;EAAE;EAAQ;EAAO,CAAC,EAClB,QAAQ"}

package/dist/bun.mjs

@@ -1,4 +1,4 @@
-import { bundleOrchidORMTables, makeOrchidOrmDbWithAdapter } from "orchid-orm";
+import { bundleOrchidORM, makeOrchidOrmDbWithAdapter } from "orchid-orm";
 import { BunAdapter, bunSchemaConfig, createDb as createDb$1 } from "pqb/bun";
 import { AdapterClass } from "pqb/internal";
 const Adapter = BunAdapter;
@@ -13,8 +13,11 @@ const makeOrchidOrmDb = (orm, { log, ...options }) => {
 		})
 	});
 };
-const orchidORM = (options, tables) => {
-	return makeOrchidOrmDb(bundleOrchidORMTables(tables), options);
+const orchidORM = ({ views, ...options }, tables) => {
+	return makeOrchidOrmDb(bundleOrchidORM({
+		tables,
+		views
+	}), options);
 };
 export { Adapter, bunSchemaConfig, createDb, makeOrchidOrmDb, orchidORM };
 

package/dist/bun.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"bun.mjs","names":["cdb"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMTables,\n  OrchidOrmParam,\n  bundleOrchidORMTables,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <T extends TableClasses>(\n  orm: OrchidORMTables<T>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <T extends TableClasses>(\n  options: OrchidOrmParam<BunOrchidORMOptions>,\n  tables: T,\n): OrchidORM<T> => {\n  const orm = bundleOrchidORMTables(tables);\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAeA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBACX,KACA,EAAE,KAAK,GAAG,cACO;AACjB,QAAO,2BAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aACX,SACA,WACiB;AAEjB,QAAO,gBADK,sBAAsB,OAAO,EACb,QAAQ"}
+{"version":3,"file":"bun.mjs","names":["cdb"],"sources":["../src/adapters/bun.ts"],"sourcesContent":["import {\n  TableClasses,\n  OrchidORM,\n  OrchidORMBundle,\n  OrchidOrmParam,\n  bundleOrchidORM,\n  makeOrchidOrmDbWithAdapter,\n} from 'orchid-orm';\nimport { BunAdapter, BunAdapterOptions, createDb as cdb } from 'pqb/bun';\nimport { DbSharedOptions, AdapterClass, EmptyObject } from 'pqb/internal';\nexport { bunSchemaConfig } from 'pqb/bun';\n\nexport interface BunOrchidORMOptions\n  extends BunAdapterOptions, DbSharedOptions {\n  views?: TableClasses;\n}\n\nexport const Adapter = BunAdapter;\n\nexport const createDb = cdb;\n\nexport const makeOrchidOrmDb = <\n  T extends TableClasses,\n  V extends TableClasses = EmptyObject,\n>(\n  orm: OrchidORMBundle<T, V>,\n  { log, ...options }: OrchidOrmParam<BunOrchidORMOptions>,\n): OrchidORM<T, V> => {\n  return makeOrchidOrmDbWithAdapter(orm, {\n    ...options,\n    log,\n    adapter: new AdapterClass({\n      driverAdapter: BunAdapter,\n      config: options,\n    }),\n  });\n};\n\nexport const orchidORM = <\n  T extends TableClasses,\n  V extends TableClasses = EmptyObject,\n>(\n  { views, ...options }: OrchidOrmParam<BunOrchidORMOptions & { views?: V }>,\n  tables: T,\n): OrchidORM<T, V> => {\n  const orm = bundleOrchidORM({ tables, views });\n  return makeOrchidOrmDb(orm, options);\n};\n"],"mappings":";;;AAiBA,MAAa,UAAU;AAEvB,MAAa,WAAWA;AAExB,MAAa,mBAIX,KACA,EAAE,KAAK,GAAG,cACU;AACpB,QAAO,2BAA2B,KAAK;EACrC,GAAG;EACH;EACA,SAAS,IAAI,aAAa;GACxB,eAAe;GACf,QAAQ;GACT,CAAC;EACH,CAAC;;AAGJ,MAAa,aAIX,EAAE,OAAO,GAAG,WACZ,WACoB;AAEpB,QAAO,gBADK,gBAAgB;EAAE;EAAQ;EAAO,CAAC,EAClB,QAAQ"}

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Adapter, AfterCommitStandaloneHook, AfterHook, Column, ColumnSchemaConfig, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateData, CreateManyMethodsNames, CreateMethodsNames, CreateSelf, DbSharedOptions, DbSqlMethod, DbTableOptionScopes, DefaultColumnTypes, DefaultSchemaConfig, DeleteMethodsNames, EmptyObject, FromArg, FromResult, Grant, IsQuery, IsolationLevel, JoinQueryMethod, MapTableScopesOption, MaybeArray, MergeQuery, PickQuerySelectableRelations, QueryAfterHook, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryManyTake, QueryManyTakeOptional, QueryOrExpression, QueryReturnType, QuerySchema, QueryScopes, RecordUnknown, RelationConfigBase, Rls, SelectableFromShape, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, StorageOptions, TableData, TableDataFn, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TransactionOptions, UniqueConstraints, UpdateData, WhereArg } from "pqb/internal";
+import { Adapter, AfterCommitStandaloneHook, AfterHook, Column, ColumnSchemaConfig, ColumnsShape, ComputedColumnsFromOptions, ComputedOptionsConfig, ComputedOptionsFactory, CreateData, CreateManyMethodsNames, CreateMethodsNames, CreateSelf, DbSharedOptions, DbSqlMethod, DbTableOptionScopes, DefaultColumnTypes, DefaultSchemaConfig, DeleteMethodsNames, EmptyObject, FromArg, FromResult, Grant, IsQuery, IsolationLevel, JoinQueryMethod, MapTableScopesOption, MaybeArray, MergeQuery, PickQuerySelectableRelations, QueryAfterHook, QueryBeforeActionHook, QueryBeforeHook, QueryData, QueryHasWhere, QueryReturnType, QuerySchema, QueryScopes, RawSqlBase, RecordUnknown, RelationConfigBase, Rls, SelectableFromShape, ShallowSimplify, ShapeColumnPrimaryKeys, ShapeUniqueColumns, StorageOptions, TableData, TableDataFn, TableDataItem, TableDataItemsUniqueColumnTuples, TableDataItemsUniqueColumns, TableDataItemsUniqueConstraints, TransactionOptions, UniqueConstraints, UpdateData, WhereArg } from "pqb/internal";
 import { Db, Query } from "pqb";
 export * from "pqb";
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends Column.Shape.QueryInit = Column.Shape.QueryInit> {
@@ -25,15 +25,14 @@ type HasOneQueryThrough<Name extends string, TableQuery extends Query> = { [K in
 type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery extends Query> = T['relations'][Name]['options'] extends RelationRefsOptions ? { [K in keyof TableQuery]: K extends '__defaults' ? { [K in keyof TableQuery['__defaults'] | T['relations'][Name]['options']['references'][number]]: true } : K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : K extends CreateManyMethodsNames ? never : TableQuery[K] } & QueryHasWhere & HasRelJoin : HasOneQueryThrough<Name, TableQuery>;
 interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query> extends RelationConfigBase {
   returnsOne: true;
+  required: T['relations'][Name]['options']['required'];
   query: Q;
   params: HasOneParams<T, Rel['options']>;
-  maybeSingle: T['relations'][Name]['options']['required'] extends true ? QueryManyTake<Q> : QueryManyTakeOptional<Q>;
   omitForeignKeyInCreate: never;
-  optionalDataForCreate: Q extends Query.Pick.IsNotReadOnly ? T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : { [P in Name]?: RelationToOneDataForCreate<{
+  dataForCreate: { [K in Name]?: Q extends Query.Pick.IsNotReadOnly ? T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : RelationToOneDataForCreate<{
     nestedCreateQuery: CreateData<Q>;
     table: Q;
-  }> } : EmptyObject;
-  dataForCreate: undefined;
+  }> : never };
   dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
     disconnect: boolean;
   } | {
@@ -67,17 +66,15 @@ interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel ext
   returnsOne: false;
   query: Q;
   params: HasOneParams<T, Rel['options']>;
-  maybeSingle: Q;
   omitForeignKeyInCreate: never;
-  optionalDataForCreate: Q extends Query.Pick.IsNotReadOnly ? { [P in Name]?: T['relations'][Name]['options'] extends RelationThroughOptions ? EmptyObject : {
+  dataForCreate: { [K in Name]?: Q extends Query.Pick.IsNotReadOnly ? T['relations'][Name]['options'] extends RelationThroughOptions ? never : {
     create?: CreateData<Q>[];
     connect?: WhereArg<Q>[];
     connectOrCreate?: {
       where: WhereArg<Q>;
       create: CreateData<Q>;
     }[];
-  } } : EmptyObject;
-  dataForCreate: undefined;
+  } : never };
   dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
     disconnect?: MaybeArray<WhereArg<Q>>;
     delete?: MaybeArray<WhereArg<Q>>;
@@ -124,15 +121,14 @@ type BelongsToParams<T extends RelationConfigSelf, FK extends string> = { [Name
 type BelongsToQuery<T extends Query, Name extends string> = { [P in keyof T]: P extends '__selectable' ? SelectableFromShape<T['shape'], Name> : P extends '__as' ? Name : P extends CreateMethodsNames | DeleteMethodsNames ? never : T[P] } & QueryHasWhere & HasRelJoin;
 interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, FK extends string, Required, Q extends Query> extends RelationConfigBase {
   returnsOne: true;
+  required: Required;
   query: Q;
   params: BelongsToParams<T, FK>;
-  maybeSingle: Required extends true ? QueryManyTake<Q> : QueryManyTakeOptional<Q>;
   omitForeignKeyInCreate: FK;
   dataForCreate: {
     columns: FK;
-    nested: Q extends Query.Pick.IsNotReadOnly ? Required extends true ? { [Key in Name]: RelationToOneDataForCreateSameQuery<Q> } : { [Key in Name]?: RelationToOneDataForCreateSameQuery<Q> } : never;
+    nested: Q extends Query.Pick.IsNotReadOnly ? Required extends true ? { [Key in Name]: RelationToOneDataForCreateSameQuery<Q> } : { [Key in Name]?: RelationToOneDataForCreateSameQuery<Q> } : { [Key in Name]?: never };
   };
-  optionalDataForCreate: EmptyObject;
   dataForUpdate: {
     disconnect: boolean;
   } | {
@@ -161,6 +157,132 @@ interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, FK ex
     };
   } : never);
 }
+interface HasAndBelongsToMany extends RelationThunkBase {
+  type: 'hasAndBelongsToMany';
+  options: HasAndBelongsToManyOptions;
+}
+interface HasAndBelongsToManyOptions<Columns extends Column.Shape.QueryInit = Column.Shape.QueryInit, Related extends ORMTableInput = ORMTableInput> {
+  required?: boolean;
+  columns: (keyof Columns)[];
+  references: string[];
+  foreignKey?: boolean | TableData.References.Options;
+  through: {
+    schema?: QuerySchema;
+    table: string;
+    columns: string[];
+    references: (keyof Related['columns']['shape'])[];
+    foreignKey?: boolean | TableData.References.Options;
+  };
+  on?: ColumnsShape.InputPartial<Related['columns']['shape']>;
+}
+type HasAndBelongsToManyParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['type'] };
+type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K] } & QueryHasWhere & HasRelJoin;
+interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends string, FK extends string, Q extends Query> extends RelationConfigBase {
+  returnsOne: false;
+  query: Q;
+  params: HasAndBelongsToManyParams<T, FK>;
+  omitForeignKeyInCreate: never;
+  dataForCreate: { [K in Name]?: Q extends Query.Pick.IsNotReadOnly ? {
+    create?: CreateData<Q>[];
+    connect?: WhereArg<Q>[];
+    connectOrCreate?: {
+      where: WhereArg<Q>;
+      create: CreateData<Q>;
+    }[];
+  } : {
+    connect?: WhereArg<Q>[];
+  } };
+  dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
+    disconnect?: MaybeArray<WhereArg<Q>>;
+    set?: MaybeArray<WhereArg<Q>>;
+    add?: MaybeArray<WhereArg<Q>>;
+    delete?: MaybeArray<WhereArg<Q>>;
+    update?: {
+      where: MaybeArray<WhereArg<Q>>;
+      data: UpdateData<Q>;
+    };
+    create?: CreateData<Q>[];
+  } : {
+    disconnect?: MaybeArray<WhereArg<Q>>;
+    set?: MaybeArray<WhereArg<Q>>;
+    add?: MaybeArray<WhereArg<Q>>;
+  };
+  dataForUpdateOne: Q extends Query.Pick.IsNotReadOnly ? {
+    disconnect?: MaybeArray<WhereArg<Q>>;
+    set?: MaybeArray<WhereArg<Q>>;
+    add?: MaybeArray<WhereArg<Q>>;
+    delete?: MaybeArray<WhereArg<Q>>;
+    update?: {
+      where: MaybeArray<WhereArg<Q>>;
+      data: UpdateData<Q>;
+    };
+    create?: CreateData<Q>[];
+    upsert?: {
+      findBy: Q['internal']['uniqueColumns'];
+      update: UpdateData<Q>;
+      create?: CreateData<Q> | (() => CreateData<Q>);
+    };
+  } : {
+    disconnect?: MaybeArray<WhereArg<Q>>;
+    set?: MaybeArray<WhereArg<Q>>;
+    add?: MaybeArray<WhereArg<Q>>;
+  };
+}
+type RelationToOneDataForCreate<Rel extends {
+  nestedCreateQuery: unknown;
+  table: Query;
+}> = {
+  create: Rel['nestedCreateQuery'];
+  connect?: never;
+  connectOrCreate?: never;
+} | {
+  create?: never;
+  connect: WhereArg<Rel['table']>;
+  connectOrCreate?: never;
+} | {
+  create?: never;
+  connect?: never;
+  connectOrCreate: {
+    where: WhereArg<Rel['table']>;
+    create: Rel['nestedCreateQuery'];
+  };
+};
+interface RelationToOneDataForCreateSameQuerySelf extends CreateSelf, PickQuerySelectableRelations {}
+type RelationToOneDataForCreateSameQuery<Q extends RelationToOneDataForCreateSameQuerySelf> = {
+  create: CreateData<Q>;
+  connect?: never;
+  connectOrCreate?: never;
+} | {
+  create?: never;
+  connect: WhereArg<Q>;
+  connectOrCreate?: never;
+} | {
+  create?: never;
+  connect?: never;
+  connectOrCreate: {
+    where: WhereArg<Q>;
+    create: CreateData<Q>;
+  };
+};
+interface RelationThunkBase {
+  type: string;
+  related: ORMTableInput;
+  options: unknown;
+}
+type RelationThunk = BelongsTo | HasOne | HasMany | HasAndBelongsToMany;
+interface RelationThunks {
+  [K: string]: RelationThunk;
+}
+type RelationTableToQuery<Relation> = Relation extends {
+  related: infer R extends ORMTableInput;
+} ? TableToDb<R, R['table'] extends string ? R['table'] : R['name'], R['table'] extends string ? R['readOnly'] extends true ? true : undefined : R['readOnly'] extends false ? undefined : true> : never;
+interface RelationConfigSelf {
+  columns: {
+    shape: Column.Shape.QueryInit;
+  };
+  relations: RelationThunks;
+}
+type RelationConfigParams<T extends RelationConfigSelf, Relation extends RelationThunk> = Relation extends BelongsTo ? BelongsToParams<T, Relation['options']['columns'][number] & string> : Relation extends HasOne | HasMany ? HasOneParams<T, Relation['options']> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyParams<T, Relation['options']['columns'][number] & string> : never;
 declare function transaction<Result>(this: {
   $qb: Db;
 }, fn: () => Promise<Result>): Promise<Result>;
@@ -200,11 +322,22 @@ interface OrchidORMTableHelper<T extends Query> {
 }
 type OrchidORMTables<T extends TableClasses = TableClasses> = { [K in keyof T]: T[K] extends {
   new (): infer R extends ORMTableInput;
-} ? OrchidORMTableHelper<TableToDb<R>> : never };
+} ? OrchidORMTableHelper<TableToDb<R, R['table'], R['readOnly'] extends true ? true : undefined>> : never };
+type OrchidORMViews<T extends TableClasses = TableClasses> = { [K in keyof T]: T[K] extends {
+  new (): infer R extends ORMTableInput;
+} ? OrchidORMTableHelper<TableToDb<R, R['name'], R['readOnly'] extends false ? undefined : true, R['materialized'] extends true ? true : undefined>> : never };
+type OrchidORMBundle<T extends TableClasses = TableClasses, V extends TableClasses = TableClasses> = OrchidORMTables<T> & {
+  $views: OrchidORMViews<V>;
+};
 type OrchidORMDbTables<T extends TableClasses = TableClasses> = { [K in keyof T]: T[K] extends {
   new (): infer R extends ORMTableInput;
-} ? TableToDb<R> : never };
-type OrchidORM<T extends TableClasses = TableClasses> = OrchidORMDbTables<T> & OrchidORMMethods;
+} ? TableToDb<R, R['table'], R['readOnly'] extends true ? true : undefined> : never };
+type OrchidORMDbViews<T extends TableClasses = TableClasses> = { [K in keyof T]: T[K] extends {
+  new (): infer R extends ORMTableInput;
+} ? TableToDb<R, R['name'], R['readOnly'] extends false ? undefined : true, R['materialized'] extends true ? true : undefined> : never };
+type OrchidORM<T extends TableClasses = TableClasses, V extends TableClasses = TableClasses> = OrchidORMDbTables<T> & {
+  $views: OrchidORMDbViews<V>;
+} & OrchidORMMethods;
 /**
  * Identity helper for table row-level security configuration.
  */
@@ -360,145 +493,30 @@ interface OrchidORMMethods {
   $close(): Promise<void>;
 }
 type OrchidOrmParam<Options> = true | null extends true ? 'Set strict: true to tsconfig' : Options;
-declare const bundleOrchidORMTables: <T extends TableClasses>(tables: T) => OrchidORMTables<T>;
-declare const makeOrchidOrmDbWithAdapter: <T extends TableClasses>(orm: OrchidORMTables<T>, options: OrchidOrmParam<({
+interface OrchidORMSetupOptions<V extends TableClasses = TableClasses> extends DbSharedOptions {
+  /**
+   * First-class regular views exposed under db.$views.
+   */
+  views?: V;
+}
+declare const bundleOrchidORM: <T extends TableClasses = EmptyObject, V extends TableClasses = EmptyObject>({
+  tables,
+  views
+}: {
+  tables?: T;
+  views?: V;
+}) => OrchidORMBundle<T, V>;
+declare const bundleOrchidORMTables: <T extends TableClasses>(tables: T) => OrchidORMBundle<T, EmptyObject>;
+declare const makeOrchidOrmDbWithAdapter: <T extends TableClasses, V extends TableClasses>(orm: OrchidORMBundle<T, V>, options: OrchidOrmParam<({
   db: Query;
 } | {
   adapter: Adapter;
-}) & DbSharedOptions>) => OrchidORM<T>;
-declare const orchidORMWithAdapter: <T extends TableClasses>(options: OrchidOrmParam<({
+}) & DbSharedOptions>) => OrchidORM<T, V>;
+declare const orchidORMWithAdapter: <T extends TableClasses, V extends TableClasses = EmptyObject>(options: OrchidOrmParam<({
   db: Query;
 } | {
   adapter: Adapter;
-}) & DbSharedOptions>, tables: T) => OrchidORM<T>;
-interface HasAndBelongsToMany extends RelationThunkBase {
-  type: 'hasAndBelongsToMany';
-  options: HasAndBelongsToManyOptions;
-}
-interface HasAndBelongsToManyOptions<Columns extends Column.Shape.QueryInit = Column.Shape.QueryInit, Related extends ORMTableInput = ORMTableInput> {
-  required?: boolean;
-  columns: (keyof Columns)[];
-  references: string[];
-  foreignKey?: boolean | TableData.References.Options;
-  through: {
-    schema?: QuerySchema;
-    table: string;
-    columns: string[];
-    references: (keyof Related['columns']['shape'])[];
-    foreignKey?: boolean | TableData.References.Options;
-  };
-  on?: ColumnsShape.InputPartial<Related['columns']['shape']>;
-}
-type HasAndBelongsToManyParams<T extends RelationConfigSelf, FK extends string> = { [Name in FK]: T['columns']['shape'][Name]['type'] };
-type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = { [K in keyof TableQuery]: K extends '__selectable' ? SelectableFromShape<TableQuery['shape'], Name> : K extends '__as' ? Name : TableQuery[K] } & QueryHasWhere & HasRelJoin;
-interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends string, FK extends string, Q extends Query> extends RelationConfigBase {
-  returnsOne: false;
-  query: Q;
-  params: HasAndBelongsToManyParams<T, FK>;
-  maybeSingle: Q;
-  omitForeignKeyInCreate: never;
-  optionalDataForCreate: { [P in Name]?: Q extends Query.Pick.IsNotReadOnly ? {
-    create?: CreateData<Q>[];
-    connect?: WhereArg<Q>[];
-    connectOrCreate?: {
-      where: WhereArg<Q>;
-      create: CreateData<Q>;
-    }[];
-  } : {
-    connect?: WhereArg<Q>[];
-  } };
-  dataForCreate: undefined;
-  dataForUpdate: Q extends Query.Pick.IsNotReadOnly ? {
-    disconnect?: MaybeArray<WhereArg<Q>>;
-    set?: MaybeArray<WhereArg<Q>>;
-    add?: MaybeArray<WhereArg<Q>>;
-    delete?: MaybeArray<WhereArg<Q>>;
-    update?: {
-      where: MaybeArray<WhereArg<Q>>;
-      data: UpdateData<Q>;
-    };
-    create?: CreateData<Q>[];
-  } : {
-    disconnect?: MaybeArray<WhereArg<Q>>;
-    set?: MaybeArray<WhereArg<Q>>;
-    add?: MaybeArray<WhereArg<Q>>;
-  };
-  dataForUpdateOne: Q extends Query.Pick.IsNotReadOnly ? {
-    disconnect?: MaybeArray<WhereArg<Q>>;
-    set?: MaybeArray<WhereArg<Q>>;
-    add?: MaybeArray<WhereArg<Q>>;
-    delete?: MaybeArray<WhereArg<Q>>;
-    update?: {
-      where: MaybeArray<WhereArg<Q>>;
-      data: UpdateData<Q>;
-    };
-    create?: CreateData<Q>[];
-    upsert?: {
-      findBy: Q['internal']['uniqueColumns'];
-      update: UpdateData<Q>;
-      create?: CreateData<Q> | (() => CreateData<Q>);
-    };
-  } : {
-    disconnect?: MaybeArray<WhereArg<Q>>;
-    set?: MaybeArray<WhereArg<Q>>;
-    add?: MaybeArray<WhereArg<Q>>;
-  };
-}
-type RelationToOneDataForCreate<Rel extends {
-  nestedCreateQuery: unknown;
-  table: Query;
-}> = {
-  create: Rel['nestedCreateQuery'];
-  connect?: never;
-  connectOrCreate?: never;
-} | {
-  create?: never;
-  connect: WhereArg<Rel['table']>;
-  connectOrCreate?: never;
-} | {
-  create?: never;
-  connect?: never;
-  connectOrCreate: {
-    where: WhereArg<Rel['table']>;
-    create: Rel['nestedCreateQuery'];
-  };
-};
-interface RelationToOneDataForCreateSameQuerySelf extends CreateSelf, PickQuerySelectableRelations {}
-type RelationToOneDataForCreateSameQuery<Q extends RelationToOneDataForCreateSameQuerySelf> = {
-  create: CreateData<Q>;
-  connect?: never;
-  connectOrCreate?: never;
-} | {
-  create?: never;
-  connect: WhereArg<Q>;
-  connectOrCreate?: never;
-} | {
-  create?: never;
-  connect?: never;
-  connectOrCreate: {
-    where: WhereArg<Q>;
-    create: CreateData<Q>;
-  };
-};
-interface RelationThunkBase {
-  type: string;
-  related: ORMTableInput;
-  options: unknown;
-}
-type RelationThunk = BelongsTo | HasOne | HasMany | HasAndBelongsToMany;
-interface RelationThunks {
-  [K: string]: RelationThunk;
-}
-type RelationTableToQuery<Relation> = Relation extends {
-  related: infer R extends ORMTableInput;
-} ? TableToDb<R> : never;
-interface RelationConfigSelf {
-  columns: {
-    shape: Column.Shape.QueryInit;
-  };
-  relations: RelationThunks;
-}
-type RelationConfigParams<T extends RelationConfigSelf, Relation extends RelationThunk> = Relation extends BelongsTo ? BelongsToParams<T, Relation['options']['columns'][number] & string> : Relation extends HasOne | HasMany ? HasOneParams<T, Relation['options']> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyParams<T, Relation['options']['columns'][number] & string> : never;
+}) & OrchidORMSetupOptions<V>>, tables: T) => OrchidORM<T, V>;
 interface TableClass<T extends ORMTableInput = ORMTableInput> {
   new (): T;
 }
@@ -512,24 +530,28 @@ interface TableInfo {
   name: string;
 }
 interface Table extends Query, TableInfo {}
-interface TableToDb<T extends ORMTableInput> extends TableInfo, Db<T['table'], T['columns']['shape'], keyof ShapeColumnPrimaryKeys<T['columns']['shape']> extends never ? never : ShapeColumnPrimaryKeys<T['columns']['shape']>, ShapeUniqueColumns<T['columns']['shape']> | TableDataItemsUniqueColumns<T['columns']['shape'], T['columns']['data']>, TableDataItemsUniqueColumnTuples<T['columns']['shape'], T['columns']['data']>, UniqueConstraints<T['columns']['shape']> | TableDataItemsUniqueConstraints<T['columns']['data']>, T['types'], T['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T>, ColumnsShape.DefaultSelectKeys<T['columns']['shape']>, T['readOnly'] extends true ? true : undefined> {
+interface TableToDb<T extends ORMTableInput, Name extends string | undefined, ReadOnly extends true | undefined, Materialized extends true | undefined = undefined> extends TableInfo, Db<Name, T['columns']['shape'], keyof ShapeColumnPrimaryKeys<T['columns']['shape']> extends never ? never : ShapeColumnPrimaryKeys<T['columns']['shape']>, ShapeUniqueColumns<T['columns']['shape']> | TableDataItemsUniqueColumns<T['columns']['shape'], T['columns']['data']>, TableDataItemsUniqueColumnTuples<T['columns']['shape'], T['columns']['data']>, UniqueConstraints<T['columns']['shape']> | TableDataItemsUniqueConstraints<T['columns']['data']>, T['types'], T['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T>, ColumnsShape.DefaultSelectKeys<T['columns']['shape']>, ReadOnly, Materialized> {
   relations: T extends RelationConfigSelf ? { [K in keyof T['relations'] & string]: T['relations'][K] extends BelongsTo ? BelongsToInfo<T, K, T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<RelationTableToQuery<T['relations'][K]>, K>> : T['relations'][K] extends HasOne ? HasOneInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasMany ? HasManyInfo<T, K, T['relations'][K], HasManyQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, K, T['relations'][K]['options']['columns'][number] & string, HasAndBelongsToManyQuery<K, RelationTableToQuery<T['relations'][K]>>> : never } : EmptyObject;
 }
-interface ORMTableInput {
-  table: string;
+interface PickORMTableInputColumns {
   columns: {
     shape: Column.Shape.QueryInit;
     data: MaybeArray<TableDataItem>;
   };
-  schema?: QuerySchema;
-  types: unknown;
-  noPrimaryKey?: boolean;
-  filePath: string;
-  language?: string;
+}
+interface PickORMTableComputed {
   /**
    * collect computed columns returned by {@link BaseTable.setColumns}
    */
   computed?: ComputedOptionsFactory<never, never>;
+}
+interface PickORMTableInputColumnsAndComputed extends PickORMTableInputColumns, PickORMTableComputed {}
+interface ORMTableInput extends PickORMTableInputColumnsAndComputed {
+  autoForeignKeys?: TableData.References.BaseOptions | boolean;
+  schema?: QuerySchema;
+  types: unknown;
+  filePath: string;
+  language?: string;
   scopes?: RecordUnknown;
   readonly softDelete?: true | string;
   comment?: string;
@@ -539,17 +561,30 @@ interface ORMTableInput {
    */
   grants?: readonly Grant.TableClassGrant[];
   readonly readOnly?: boolean;
-  autoForeignKeys?: TableData.References.BaseOptions | boolean;
+  readonly materialized?: true;
+  table?: string;
+  noPrimaryKey?: boolean;
+  name?: string;
+  sql?: string | RawSqlBase;
+  recursive?: boolean;
+  checkOption?: 'LOCAL' | 'CASCADED';
+  securityBarrier?: boolean;
+  securityInvoker?: boolean;
+  withData?: boolean;
 }
-type Queryable<T extends ORMTableInput> = ShallowSimplify<{ [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'] }>;
-type DefaultSelect<T extends ORMTableInput> = ShallowSimplify<ColumnsShape.DefaultOutput<T['columns']['shape']>>;
-type Selectable<T extends ORMTableInput> = T['computed'] extends ((t: never) => infer R extends ComputedOptionsConfig) ? ShallowSimplify<ColumnsShape.Output<T['columns']['shape']> & { [K in keyof R]: R[K] extends QueryOrExpression<unknown> ? R[K]['result']['value']['outputType'] : R[K] extends (() => {
+type Queryable<T extends PickORMTableInputColumns> = ShallowSimplify<{ [K in keyof T['columns']['shape']]?: T['columns']['shape'][K]['queryType'] }>;
+type DefaultSelect<T extends PickORMTableInputColumns> = ShallowSimplify<ColumnsShape.DefaultOutput<T['columns']['shape']>>;
+type Selectable<T extends PickORMTableInputColumnsAndComputed> = T['computed'] extends ((t: never) => infer R extends ComputedOptionsConfig) ? ShallowSimplify<ColumnsShape.Output<T['columns']['shape']> & { [K in keyof R]: R[K] extends {
+  result: {
+    value: infer Value extends Column.Pick.QueryColumn;
+  };
+} ? Value['outputType'] : R[K] extends (() => {
   result: {
     value: infer Value extends Column.Pick.QueryColumn;
   };
 }) ? Value['outputType'] : never }> : ShallowSimplify<ColumnsShape.Output<T['columns']['shape']>>;
-type Insertable<T extends ORMTableInput> = ShallowSimplify<ColumnsShape.Input<T['columns']['shape']>>;
-type Updatable<T extends ORMTableInput> = ShallowSimplify<ColumnsShape.InputPartial<T['columns']['shape']>>;
+type Insertable<T extends PickORMTableInputColumns> = ShallowSimplify<ColumnsShape.Input<T['columns']['shape']>>;
+type Updatable<T extends PickORMTableInputColumns> = ShallowSimplify<ColumnsShape.InputPartial<T['columns']['shape']>>;
 type BeforeHookMethod = (cb: QueryBeforeHook) => void;
 type BeforeActionHookMethod = (cb: QueryBeforeActionHook) => void;
 type AfterHookMethod = (cb: QueryAfterHook) => void;
@@ -563,7 +598,7 @@ interface SetColumnsResult<Shape extends Column.Shape.QueryInit, Data extends Ma
   data: Data extends unknown[] ? Data : [Data];
 }
 interface BaseTableInstance<ColumnTypes> {
-  table: string;
+  table?: string;
   columns: {
     shape: Column.Shape.QueryInit;
     data: MaybeArray<TableDataItem>;
@@ -677,8 +712,11 @@ interface BaseTableInstance<ColumnTypes> {
   /**
    * See {@link ScopeMethods}
    */
-  setScopes<Table extends string, Shape extends Column.Shape.QueryInit, Keys extends string>(this: {
+  setScopes<Table extends string, Shape extends Column.Shape.QueryInit, Keys extends string>(this: ({
     table: Table;
+  } | {
+    name: Table;
+  }) & {
     columns: {
       shape: Shape;
     };
@@ -748,6 +786,8 @@ interface BaseTableClass<SchemaConfig extends ColumnSchemaConfig, ColumnTypes> {
   columnTypes: ColumnTypes;
   getFilePath(): string;
   sql: DbSqlMethod<ColumnTypes>;
+  View: TableClass<BaseViewInstance<ColumnTypes>>;
+  MaterializedView: TableClass<BaseMaterializedViewInstance<ColumnTypes>>;
   new (): BaseTableInstance<ColumnTypes>;
   instance(): BaseTableInstance<ColumnTypes>;
   /**
@@ -777,6 +817,22 @@ interface BaseTableClass<SchemaConfig extends ColumnSchemaConfig, ColumnTypes> {
    */
   updateSchema: SchemaConfig['updateSchema'];
 }
+interface BaseViewInstance<ColumnTypes> extends BaseTableInstance<ColumnTypes> {
+  name: string;
+  sql: string | RawSqlBase;
+  readonly readOnly?: boolean;
+  recursive?: boolean;
+  checkOption?: 'LOCAL' | 'CASCADED';
+  securityBarrier?: boolean;
+  securityInvoker?: boolean;
+}
+interface BaseMaterializedViewInstance<ColumnTypes> extends BaseTableInstance<ColumnTypes> {
+  name: string;
+  sql: string | RawSqlBase;
+  readonly readOnly?: true;
+  readonly materialized: true;
+  withData?: boolean;
+}
 declare function createBaseTable<SchemaConfig extends ColumnSchemaConfig = DefaultSchemaConfig, ColumnTypes = DefaultColumnTypes<SchemaConfig>>({
   schemaConfig,
   columnTypes: columnTypesArg,
@@ -812,4 +868,4 @@ declare const createRepo: <T extends Query, Methods extends MethodsBase<T>>(tabl
   table: T["table"];
   shape: T["shape"];
 }>(q: Q) => Query & Q & MapMethods<T, Methods>) & T, Methods>;
-export { BaseTableClass, BaseTableInstance, DefaultSelect, FromQuery, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, OrchidORM, OrchidORMDbTables, OrchidORMTableHelper, OrchidORMTables, OrchidOrmParam, Queryable, Repo, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, bundleOrchidORMTables, createBaseTable, createRepo, defineRls, makeOrchidOrmDbWithAdapter, orchidORMWithAdapter, setGrants };
+export { BaseMaterializedViewInstance, BaseTableClass, BaseTableInstance, BaseViewInstance, DefaultSelect, FromQuery, Insertable, MapMethods, MapQueryMethods, MethodsBase, ORMTableInput, OrchidORM, OrchidORMBundle, OrchidORMDbTables, OrchidORMDbViews, OrchidORMTableHelper, OrchidORMTables, OrchidORMViews, OrchidOrmParam, PickORMTableComputed, PickORMTableInputColumns, PickORMTableInputColumnsAndComputed, Queryable, Repo, Selectable, SetColumnsResult, Table, TableClass, TableClasses, TableInfo, TableToDb, Updatable, bundleOrchidORM, bundleOrchidORMTables, createBaseTable, createRepo, defineRls, makeOrchidOrmDbWithAdapter, orchidORMWithAdapter, setGrants };