orange-orm 4.7.8 → 4.7.10-beta.0

package/dist/index.browser.mjs

@@ -4218,13 +4218,13 @@ function requireNewColumn () {
 
 		c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', c, table, ...rest]);
 		c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', c, table, ...rest]);
-		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, ...rest]);
-		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, ...rest]);
+		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, false, ...rest]);
+		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, false, ...rest]);
 		c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', c, table, false, ...rest]);
 		c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', c, table, ...rest]);
 		c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', c, table, ...rest]);
-		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, ...rest]);
-		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, ...rest]);
+		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, false, ...rest]);
+		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, false, ...rest]);
 		c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', c, table, false, ...rest]);
 
 		function self(context) {
@@ -9415,13 +9415,13 @@ function requireRelatedColumn () {
 
 		c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', column, relations, ...rest]);
 		c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', column, relations, ...rest]);
-		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', column, relations, ...rest]);
-		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', column, relations, ...rest]);
+		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', column, relations, false, ...rest]);
+		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', column, relations, false, ...rest]);
 		c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', column, relations, false, ...rest]);
 		c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', column, relations, ...rest]);
 		c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', column, relations, ...rest]);
-		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', column, relations, ...rest]);
-		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', column, relations, ...rest]);
+		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', column, relations, false, ...rest]);
+		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', column, relations, false, ...rest]);
 		c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', column, relations, false, ...rest]);
 		c.self = (context, ...rest) => childColumn.apply(null, [context, column, relations, ...rest]);
 

package/dist/index.mjs

@@ -4219,13 +4219,13 @@ function requireNewColumn () {
 
 		c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', c, table, ...rest]);
 		c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', c, table, ...rest]);
-		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, ...rest]);
-		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, ...rest]);
+		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', c, table, false, ...rest]);
+		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', c, table, false, ...rest]);
 		c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', c, table, false, ...rest]);
 		c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', c, table, ...rest]);
 		c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', c, table, ...rest]);
-		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, ...rest]);
-		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, ...rest]);
+		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', c, table, false, ...rest]);
+		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', c, table, false, ...rest]);
 		c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', c, table, false, ...rest]);
 
 		function self(context) {
@@ -9416,13 +9416,13 @@ function requireRelatedColumn () {
 
 		c.groupSum = (context, ...rest) => aggregateGroup.apply(null, [context, 'sum', column, relations, ...rest]);
 		c.groupAvg = (context, ...rest) => aggregateGroup.apply(null, [context, 'avg', column, relations, ...rest]);
-		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', column, relations, ...rest]);
-		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', column, relations, ...rest]);
+		c.groupMin = (context, ...rest) => aggregateGroup.apply(null, [context, 'min', column, relations, false, ...rest]);
+		c.groupMax = (context, ...rest) => aggregateGroup.apply(null, [context, 'max', column, relations, false, ...rest]);
 		c.groupCount = (context, ...rest) => aggregateGroup.apply(null, [context, 'count', column, relations, false, ...rest]);
 		c.sum = (context, ...rest) => aggregate.apply(null, [context, 'sum', column, relations, ...rest]);
 		c.avg = (context, ...rest) => aggregate.apply(null, [context, 'avg', column, relations, ...rest]);
-		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', column, relations, ...rest]);
-		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', column, relations, ...rest]);
+		c.min = (context, ...rest) => aggregate.apply(null, [context, 'min', column, relations, false, ...rest]);
+		c.max = (context, ...rest) => aggregate.apply(null, [context, 'max', column, relations, false, ...rest]);
 		c.count = (context, ...rest) => aggregate.apply(null, [context, 'count', column, relations, false, ...rest]);
 		c.self = (context, ...rest) => childColumn.apply(null, [context, column, relations, ...rest]);
 
@@ -18403,8 +18403,14 @@ function requireWrapQuery$1 () {
 		function toType(p) {
 			if (typeof p === 'string')
 				return TYPES.VarChar;
-			else if (Number.isInteger(p))
-				return TYPES.Int;
+			else if (Number.isInteger(p)) {
+				// Check if the integer is within the 32-bit signed integer range
+				if (p >= -2147483648 && p <= 2147483647) {
+					return TYPES.Int;
+				} else {
+					return TYPES.BigInt;
+				}
+			}
 			else if (typeof p === 'number')
 				return TYPES.Money;
 			else if (p instanceof Date && !isNaN(p))

package/docs/changelog.md

@@ -1,6 +1,8 @@
 ## Changelog
+__4.7.9__  
+Bugfix: MsSql: Validation failed for parameter '0'. Value must be between -2147483648 and 2147483647, inclusive. See [#131](https://github.com/alfateam/orange-orm/issues/131)  
 __4.7.8__  
-Bugfix: Support for multiple result sets from stored procedures in MsSql. See [#130](https://github.com/alfateam/issues/130)  
+Bugfix: Support for multiple result sets from stored procedures in MsSql. See [#130](https://github.com/alfateam/orange-orm/issues/130)  
 __4.7.7__  
 Always do logging with question mark as placeholder instead of dialect specific placeholder.  
 __4.7.6__  
@@ -8,13 +10,13 @@ Changed logging for SAP ASE.
 __4.7.5__  
 Implemented automatic hex conversion for non-ASCII UTF-8 characters in database parameters to resolve SAP ASE encoding issues.  
 __4.7.4__  
-Bugfix: SAP ASE: Do not throw errors on warnings. See [#129](https://github.com/alfateam/issues/129)  
+Bugfix: SAP ASE: Do not throw errors on warnings. See [#129](https://github.com/alfateam/orange-orm/issues/129)  
 __4.7.3__  
-Bugfix:  lessThanOrEqual throws incorrect syntax. See [#128](https://github.com/alfateam/issues/128)  
+Bugfix:  lessThanOrEqual throws incorrect syntax. See [#128](https://github.com/alfateam/orange-orm/issues/128)  
 __4.7.2__  
 Updated dependencies    
 __4.7.1__  
-Bugfix:  Error when using bun and sqlite: Cannot find package 'Database'. See [#127](https://github.com/alfateam/issues/127)  
+Bugfix:  Error when using bun and sqlite: Cannot find package 'Database'. See [#127](https://github.com/alfateam/orange-orm/issues/127)  
 __4.7.0__  
 Support for [PGLite](https://pglite.dev/). See [#124](https://github.com/alfateam/orange-orm/issues/124)  
 __4.6.3__  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orange-orm",
-  "version": "4.7.8",
+  "version": "4.7.10-beta.0",
   "main": "./src/index.js",
   "module": "./dist/index.mjs",
   "browser": "./dist/index.browser.mjs",
@@ -26,6 +26,8 @@
     "MySQL",
     "mssql",
     "Microsoft Sql Server",
+    "PGlite",
+    "Cloudflare D1",
     "PostgreSql",
     "Postgres",
     "pg",

package/src/cyclic.d.ts

@@ -0,0 +1,132 @@
+// Type definitions using a type mapping approach
+type EntityMap = {
+  Order: {
+    id: string;
+    date: Date;
+    total: number;
+  };
+  Line: {
+    id: string;
+    quantity: number;
+    price: number;
+  };
+  Package: {
+    id: string;
+    trackingNumber: string;
+    weight: number;
+  };
+  Customer: {
+    id: string;
+    name: string;
+    email: string;
+  };
+};
+
+// Enhanced relation mapping that includes cardinality information
+type RelationMap = {
+  Order: {
+    lines: { type: 'Line'; isArray: true };
+    customer: { type: 'Customer'; isArray: false };
+  };
+  Line: {
+    packages: { type: 'Package'; isArray: true };
+    order: { type: 'Order'; isArray: false };
+  };
+  Customer: {
+    orders: { type: 'Order'; isArray: true };
+  };
+  Package: {};
+};
+
+// Helper type to extract the entity type from a relation
+type RelationEntityType<R> = R extends { type: infer T extends keyof EntityMap } ? T : never;
+
+// Helper type to determine if a relation is an array
+type IsArray<R> = R extends { isArray: infer A extends boolean } ? A : false;
+
+// Generic deep type resolver
+type Depth = [never, 0, 1, 2, 3, 4, 5];
+
+// RecursiveType generic with improved depth handling
+type RecursiveType<
+  T extends keyof EntityMap,
+  D extends number = 5
+> = {
+  // Always include base properties
+  [K in keyof EntityMap[T]]: EntityMap[T][K];
+} & (D extends 0
+  ? // At max depth, only include base properties (which are already included above)
+    {}
+  : // Otherwise include relations with appropriate depth reduction
+    {
+      [K in keyof RelationMap[T]]: IsArray<RelationMap[T][K]> extends true
+        ? RecursiveType<
+            RelationEntityType<RelationMap[T][K]>,
+            Depth[D]
+          >[]
+        : RecursiveType<
+            RelationEntityType<RelationMap[T][K]>,
+            Depth[D]
+          >;
+    });
+
+// Generate the entity types with relationships resolved to the specified depth
+type Order = RecursiveType<'Order', 6>;
+
+type Line = RecursiveType<'Line'>;
+type Package = RecursiveType<'Package'>;
+type Customer = RecursiveType<'Customer'>;
+
+// Example usage
+function processOrder(order: Order, line: Line) {
+  // Can access nested properties up to depth 5
+  // const trackingNumber = order.customer.orders[0].lines[0].order.lines[0].packages[0].
+  // const orderId = order.customer.orders[0].customer.orders[0].lines[0].
+  line.order.customer.orders[0].lines[0].packages[0].
+  
+  console.log(trackingNumber, orderId);
+}
+
+// Allow custom depth control per entity type
+type OrderWithDepth1 = RecursiveType<'Order', 4>;
+
+// Example with custom depth
+function processOrderWithLimitedDepth(order: OrderWithDepth1) {
+  // This would work (depth 1)  
+
+  console.log(order.customer.id); // Can access base properties at max depth
+  console.log(order.customer.name); // Can access base properties at max depth
+  
+  // This would error - beyond depth 1
+  // console.log(order.customer.orders[0].id);
+}
+
+// Example of creating an instance with this type system
+const sampleOrder: Order = {
+  id: "ORD-123",
+  date: new Date(),
+  total: 299.99,
+  customer: {
+    id: "CUST-456",
+    name: "John Doe",
+    email: "john@example.com",
+    orders: [
+      /* would be recursive orders */
+    ]
+  },
+  lines: [
+    {
+      id: "LINE-789",
+      quantity: 2,
+      price: 149.99,
+      order: /* circular reference */,
+      packages: [
+        {
+          id: "PKG-101",
+          trackingNumber: "TRK123456789",
+          weight: 1.5
+        }
+      ]
+    }
+  ]
+};

package/src/index.d.ts

@@ -4,7 +4,8 @@ import type { RequestHandler } from 'express';
 import type { D1Database } from '@cloudflare/workers-types';
 import type { ConnectionConfiguration } from 'tedious';
 import type { PoolAttributes } from 'oracledb';
-import type { AllowedDbMap, DbMapper, MappedDbDef } from './map';
+import type { AllowedDbMap, DbMapper, MappedDbDef, MergeProperties } from './map';
+import type { Filter as MapFilter, RawFilter as MapRawFilter, Pool as MapPool, PoolOptions as MapPoolOptions } from './map2';
 
 declare function r(config: r.Config): unknown;
 
@@ -26,12 +27,12 @@ declare namespace r {
     function off(type: 'query', cb: (e: QueryEvent) => void): void;
     function map<V extends AllowedDbMap<V>>(
 		fn: (mapper: DbMapper<{}>) => V
-	): MappedDbDef<V>;
+	): MappedDbDef<MergeProperties<V, V>>;
     function createPatch(original: any[], modified: any[]): JsonPatch;
     function createPatch(original: any, modified: any): JsonPatch;
 
     type JsonPatch = Array<{
-        op: "add" | "remove" | "replace" | "copy" | "move" | "test";
+        op: 'add' | 'remove' | 'replace' | 'copy' | 'move' | 'test';
         path: string;
         value?: any;
         from?: string;
@@ -48,13 +49,8 @@ declare namespace r {
         result: []
     }
 
-    export interface Pool {
-        end(): Promise<void>;
-    }
-
-    export interface PoolOptions {
-        size?: number;
-    }
+    export type  Pool = MapPool;
+    export type  PoolOptions = MapPoolOptions;
 
     export interface Join {
         by(...columns: string[]): JoinBy;
@@ -65,8 +61,8 @@ declare namespace r {
     }
 
     export abstract class JoinRelation {
-        columns: ColumnDef[];
-        childTable: Table;
+    	columns: ColumnDef[];
+    	childTable: Table;
     }
 
     export interface Table {
@@ -155,17 +151,10 @@ declare namespace r {
         as(dbName: string): ColumnNotNullOf<T>;
     }
 
-    var filter: Filter;
-    export interface RawFilter {
-        sql: string | (() => string);
-        parameters?: any[];
-    }
+    const filter: Filter;
 
-    export interface Filter extends RawFilter {
-        and(filter: Filter, ...filters: Filter[]): Filter;
-        or(filter: Filter, ...filters: Filter[]): Filter;
-        not(): Filter;
-    }
+    export type RawFilter = MapRawFilter;
+    export type Filter = MapFilter;
 
     export type Concurrency = 'optimistic' | 'skipOnConflict' | 'overwrite';
 
@@ -223,11 +212,11 @@ declare namespace r {
          */
         iEqual(value: string | null): Filter;
         /**
-        * ignore case, postgres only         
+        * ignore case, postgres only
         * */
         iEq(value: string | null): Filter;
         /**
-         * ignore case, postgres only         
+         * ignore case, postgres only
          */
         iEq(value: string | null): Filter;
     }

package/src/map.d.ts

@@ -4,21 +4,28 @@ import type { ConnectionConfiguration } from 'tedious';
 import type { D1Database } from '@cloudflare/workers-types';
 import type { PoolAttributes } from 'oracledb';
 import type { AxiosInterceptorManager, InternalAxiosRequestConfig, AxiosResponse } from 'axios';
+import type { DBClient } from './map2';
+
 
-export type MappedDbDef<T> = {
-	map<V extends AllowedDbMap<V>>(
-		callback: (mapper: DbMapper<T>) => V
-	): MappedDbDef<MergeProperties<T, V>>;
-	<O extends DbOptions<T>>(concurrency: O): NegotiateDbInstance<T, O>;
-} & T & DbConnectable<T>;
 
-type MergeProperties<T, V> = {
+//todo
+export type MergeProperties<T, V> = {
 	[K in keyof T | keyof V]:
-	K extends keyof T ? (T[K] extends MappedTableDef<infer M>
-		? (K extends keyof V ? (V[K] extends MappedTableDef<infer N> ? MappedTableDef<M & N> : V[K]) : T[K])
-		: T[K])
-	: (K extends keyof V ? V[K] : never);
-};
+	  K extends keyof T
+		? T[K] extends MappedTableDef<infer M>
+		  ? K extends keyof V
+			? V[K] extends MappedTableDef<infer N>
+			  ? MappedTableDef<M & N & TableAlias<K>>
+			  : V[K]
+			: T[K]
+		  : T[K]
+		: K extends keyof V
+		? V[K] extends MappedTableDef<infer N>
+		  ? MappedTableDef<N & TableAlias<K>>
+		  : V[K]
+		: never;
+  };
+
 
 
 export type DbMapper<T> = {
@@ -30,21 +37,21 @@ type MappedDb<T> = {
 } & DbConnectable<T>;
 
 type DbConnectable<T> = {
-	http(url: string): MappedDbInstance<T>;
-	d1(database: D1Database): MappedDbInstance<T>;
-	postgres(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
-	pglite(config?: PGliteOptions| string | undefined, options?: PoolOptions): MappedDbInstance<T>;
-	sqlite(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
-	sap(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
-	mssql(connectionConfig: ConnectionConfiguration, options?: PoolOptions): MappedDbInstance<T>;
-	mssql(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
-	mssqlNative(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
-	mysql(connectionString: string, options?: PoolOptions): MappedDbInstance<T>;
-	oracle(config: PoolAttributes, options?: PoolOptions): MappedDbInstance<T>;
+	http(url: string): DBClient<SchemaFromMappedDb<T>>;
+	d1(database: D1Database): DBClient<SchemaFromMappedDb<T>>;
+	postgres(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	pglite(config?: PGliteOptions| string | undefined, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	sqlite(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	sap(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	mssql(connectionConfig: ConnectionConfiguration, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	mssql(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	mssqlNative(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	mysql(connectionString: string, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
+	oracle(config: PoolAttributes, options?: PoolOptions): DBClient<SchemaFromMappedDb<T>>;
 };
 
 type NegotiateDbInstance<T, C> = C extends WithDb
-	? MappedDbInstance<T>
+	? DBClient<SchemaFromMappedDb<T>>
 	: MappedDb<T>;
 
 type WithDb = {
@@ -188,7 +195,7 @@ type ExpandedMappedTable<T, FL = ExpandedFetchingStrategy<T>> = {
 	replace(
 		row: StrategyToInsertRowData<T> | StrategyToInsertRowData<T>[]
 	): Promise<void>;
-	
+
 	replace<FS extends FetchingStrategy<T>>(
 		row: StrategyToInsertRowData<T>,
 		strategy: FS
@@ -313,7 +320,7 @@ type MappedTable<T> = {
 		filter?: Filter | PrimaryRowFilter<T>,
 		fetchingStrategy?: FS
 	): Promise<StrategyToRow<FetchedProperties<T, FS>, T>>;
-	
+
 	update(
 		values: StrategyToUpdateRowData<T>,
 		where: FetchingStrategy<T>
@@ -328,7 +335,7 @@ type MappedTable<T> = {
 	replace(
 		row: StrategyToInsertRowData<T> | StrategyToInsertRowData<T>[]
 	): Promise<void>;
-	
+
 	replace<FS extends FetchingStrategy<T>>(
 		row: StrategyToInsertRowData<T>,
 		strategy: FS
@@ -616,7 +623,7 @@ type AggregateStrategyBase<T> =
 	};
 
 
-type FetchingStrategyBase<T, IsMany = true> = 
+type FetchingStrategyBase<T, IsMany = true> =
 {
 	[K in keyof T &
 	keyof RemoveNever<
@@ -624,7 +631,7 @@ type FetchingStrategyBase<T, IsMany = true> =
 	>]?: T[K] extends ColumnSymbols
 	? boolean
 	: boolean | FetchingStrategyBase<T[K], T[K] extends ManyRelation ? true: false> | AggType<T[K]>;
-} & 
+} &
 (IsMany extends true ? {
 	limit?: number;
 	offset?: number;
@@ -972,6 +979,7 @@ type MappedTableDefInit<T> = {
 	): MappedTableDef<T & V>;
 } & T;
 
+//todo
 type MappedTableDef<T> = {
 	map<V extends AllowedColumnsAndTablesMap<V>>(
 		callback: (mapper: ColumnMapper<T>) => V
@@ -1639,7 +1647,7 @@ type DateColumnTypeDef<M> = DateValidator<M> & {
 	serializable(value: boolean): DateColumnTypeDef<M>;
 	JSONSchema(schema: object, options?: Options): DateColumnTypeDef<M>;
 	default(value: string | Date | null | undefined | (() => string | Date | null | undefined)): DateColumnTypeDef<M>;
-	dbNull(value: String | Date): DateColumnTypeDef<M>;
+	dbNull(value: string | Date): DateColumnTypeDef<M>;
 } & ColumnTypeOf<DateColumnType<M>> &
 	M;
 
@@ -1650,7 +1658,7 @@ type DateWithTimeZoneColumnTypeDef<M> = DateValidator<M> & {
 	serializable(value: boolean): DateWithTimeZoneColumnTypeDef<M>;
 	JSONSchema(schema: object, options?: Options): DateWithTimeZoneColumnTypeDef<M>;
 	default(value: string | Date | null | undefined | (() => string | Date | null | undefined)): DateWithTimeZoneColumnTypeDef<M>;
-	dbNull(value: String | Date): DateWithTimeZoneColumnTypeDef<M>;
+	dbNull(value: string | Date): DateWithTimeZoneColumnTypeDef<M>;
 } & ColumnTypeOf<DateWithTimeZoneColumnType<M>> &
 	M;
 
@@ -1783,4 +1791,97 @@ type Increment<C extends number> = C extends 0
 	: C extends 4
 	? 5
 	: 0;
-	
+
+
+type TableAlias<Alias> = {
+	__tableAlias: Alias;
+  };
+
+
+
+export type SchemaFromMappedDb<T> = {
+  [K in keyof T]: T[K] extends MappedTableDef<infer Def>
+    ? TableSchema<Def>
+    : never;
+};
+
+type TableSchema<T> = {
+  columns: {
+    [K in keyof T as T[K] extends ColumnSymbols ? K : never]: ColumnToSchemaType<T[K]>;
+  };
+  primaryKey: ExtractPrimaryKeyNames<T>;
+
+  relations: {
+    [K in keyof T as T[K] extends RelatedTable | ManyRelation ? K : never]:
+      T[K] extends ManyRelation
+        ? { type: 'hasMany'; target: RelationTarget<T[K]> }
+        : T[K] extends RelatedTable
+          ? { type: 'hasOne'; target: RelationTarget<T[K]> }
+          : never;
+  };
+};
+
+type ExtractPrimaryKeyNames<T> =
+  UnionToTuple<{ [K in keyof T]: T[K] extends IsPrimary ? K : never }[keyof T]> extends infer R
+    ? R extends string[] ? R : []
+    : [];
+
+
+type RelationTarget<T> =
+  T extends { __tableAlias: infer S } ? Extract<S, string> : string;
+
+type ColumnToSchemaType<T> =
+  T extends JsonOf<infer U>
+    ? { ' type': 'json'; ' tsType': U }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends JSONColumnSymbol & JsonOf<infer U>
+    ? { ' type': 'json'; ' tsType': U }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends StringColumnSymbol
+    ? { ' type': 'string' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends UuidColumnSymbol
+    ? { ' type': 'uuid' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends NumericColumnSymbol
+    ? { ' type': 'numeric' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends DateColumnSymbol | DateWithTimeZoneColumnSymbol
+    ? { ' type': 'date' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends BooleanColumnSymbol
+    ? { ' type': 'boolean' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  T extends BinaryColumnSymbol
+    ? { ' type': 'binary' }
+      & (T extends NotNullExceptInsert ? { ' notNull': true; ' notNullExceptInsert': true }
+         : T extends NotNull ? { ' notNull': true }
+         : {}) :
+  never;
+
+export type MappedDbDef<T> = {
+  map<V extends AllowedDbMap<V>>(
+    callback: (mapper: DbMapper<T>) => V
+  ): MappedDbDef<MergeProperties<T, V>>;
+  <O extends DbOptions<T>>(concurrency: O): NegotiateDbInstance<T, O>;
+
+  /**
+   * Returns the schema of the mapped DB as a generic type
+   * Usage: type Schema = ReturnType<typeof db.toSchema>
+   */
+  toSchema: <U = T>() => SchemaFromMappedDb<U>;
+} & T & DbConnectable<T>;