Merge branch 'alternation-engine' of https://github.com/drizzle-team/drizzle-orm into alternation-engine

Author: AleksandrSherman

drizzle-orm/src/cockroach-core/dialect.ts

@@ -7,17 +7,7 @@ import {
 	mapColumnsInSQLToAlias,
 } from '~/alias.ts';
 import { CasingCache } from '~/casing.ts';
-import {
-	CockroachColumn,
-	CockroachDate,
-	CockroachDateString,
-	CockroachDecimal,
-	CockroachJsonb,
-	CockroachTime,
-	CockroachTimestamp,
-	CockroachTimestampString,
-	CockroachUUID,
-} from '~/cockroach-core/columns/index.ts';
+import { CockroachColumn } from '~/cockroach-core/columns/index.ts';
 import type {
 	AnyCockroachSelectQueryBuilder,
 	CockroachDeleteConfig,
@@ -32,16 +22,7 @@ import { entityKind, is } from '~/entity.ts';
 import { DrizzleError } from '~/errors.ts';
 import type { MigrationConfig, MigrationMeta, MigratorInitFailResponse } from '~/migrator.ts';
 import { and, eq, View } from '~/sql/index.ts';
-import {
-	type DriverValueEncoder,
-	type Name,
-	Param,
-	type QueryTypingsValue,
-	type QueryWithTypings,
-	SQL,
-	sql,
-	type SQLChunk,
-} from '~/sql/sql.ts';
+import { type Name, Param, type QueryWithTypings, SQL, sql, type SQLChunk } from '~/sql/sql.ts';
 import { Subquery } from '~/subquery.ts';
 import { getTableName, getTableUniqueName, Table } from '~/table.ts';
 import { type Casing, orderSelectedFields, type UpdateSet } from '~/utils.ts';
@@ -598,31 +579,12 @@ export class CockroachDialect {
 		return sql`refresh materialized view${concurrentlySql} ${view}${withNoDataSql}`;
 	}
 
-	prepareTyping(encoder: DriverValueEncoder<unknown, unknown>): QueryTypingsValue {
-		if (is(encoder, CockroachJsonb)) {
-			return 'json';
-		} else if (is(encoder, CockroachDecimal)) {
-			return 'decimal';
-		} else if (is(encoder, CockroachTime)) {
-			return 'time';
-		} else if (is(encoder, CockroachTimestamp) || is(encoder, CockroachTimestampString)) {
-			return 'timestamp';
-		} else if (is(encoder, CockroachDate) || is(encoder, CockroachDateString)) {
-			return 'date';
-		} else if (is(encoder, CockroachUUID)) {
-			return 'uuid';
-		} else {
-			return 'none';
-		}
-	}
-
 	sqlToQuery(sql: SQL, invokeSource?: 'indexes' | undefined): QueryWithTypings {
 		return sql.toQuery({
 			casing: this.casing,
 			escapeName: this.escapeName,
 			escapeParam: this.escapeParam,
 			escapeString: this.escapeString,
-			prepareTyping: this.prepareTyping,
 			invokeSource,
 		});
 	}

drizzle-orm/src/cockroach-core/query-builders/query.ts

@@ -9,7 +9,7 @@ import {
 import { entityKind } from '~/entity.ts';
 import { QueryPromise } from '~/query-promise.ts';
 import type { RunnableQuery } from '~/runnable-query.ts';
-import type { Query, QueryWithTypings, SQL, SQLWrapper } from '~/sql/sql.ts';
+import type { Query, SQL, SQLWrapper } from '~/sql/sql.ts';
 import { tracer } from '~/tracing.ts';
 import type { KnownKeysOnly, NeonAuthToken } from '~/utils.ts';
 import type { CockroachDialect } from '../dialect.ts';
@@ -130,10 +130,10 @@ export class CockroachRelationalQuery<TResult> extends QueryPromise<TResult>
 		return this._getQuery().sql as SQL;
 	}
 
-	private _toSQL(): { query: BuildRelationalQueryResult; builtQuery: QueryWithTypings } {
+	private _toSQL(): { query: BuildRelationalQueryResult; builtQuery: Query } {
 		const query = this._getQuery();
 
-		const builtQuery = this.dialect.sqlToQuery(query.sql as SQL);
+		const { typings: _typings, ...builtQuery } = this.dialect.sqlToQuery(query.sql as SQL);
 
 		return { query, builtQuery };
 	}

drizzle-orm/src/sqlite-cloud/driver.ts

@@ -5,7 +5,7 @@ import { DefaultLogger } from '~/logger.ts';
 import type { AnyRelations, EmptyRelations } from '~/relations.ts';
 import { BaseSQLiteDatabase } from '~/sqlite-core/db.ts';
 import { SQLiteAsyncDialect } from '~/sqlite-core/dialect.ts';
-import { type DrizzleConfig, isConfig } from '~/utils.ts';
+import type { DrizzleConfig } from '~/utils.ts';
 import { SQLiteCloudSession } from './session.ts';
 
 export type SQLiteCloudRunResult = unknown;
@@ -92,9 +92,9 @@ export function drizzle<
 	TClient extends Database = Database,
 >(
 	...params: [
-		TClient | string,
+		string,
 	] | [
-		TClient | string,
+		string,
 		DrizzleConfig<TSchema, TRelations>,
 	] | [
 		(
@@ -115,21 +115,17 @@ export function drizzle<
 		return construct(instance, params[1]) as any;
 	}
 
-	if (isConfig(params[0])) {
-		const { connection, client, ...drizzleConfig } = params[0] as
-			& { connection?: DatabaseOpts; client?: TClient }
-			& DrizzleConfig<TSchema, TRelations>;
+	const { connection, client, ...drizzleConfig } = params[0] as
+		& { connection?: DatabaseOpts; client?: TClient }
+		& DrizzleConfig<TSchema, TRelations>;
 
-		if (client) return construct(client, drizzleConfig) as any;
+	if (client) return construct(client, drizzleConfig) as any;
 
-		const instance = typeof connection === 'string'
-			? new Database(connection)
-			: new Database(connection.path, connection);
+	const instance = typeof connection === 'string'
+		? new Database(connection)
+		: new Database(connection.path, connection);
 
-		return construct(instance, drizzleConfig) as any;
-	}
-
-	return construct(params[0] as TClient, params[1] as DrizzleConfig<TSchema, TRelations> | undefined) as any;
+	return construct(instance, drizzleConfig) as any;
 }
 
 export namespace drizzle {

drizzle-orm/tests/casing/cockroach-to-camel.test.ts

@@ -152,7 +152,6 @@ describe('cockroach to camel case', () => {
 			sql:
 				'select "users"."id", "users"."AGE", "users"."firstName" || \' \' || "users"."lastName" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."usesDrizzleOrm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."userId" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2 limit $3',
 			params: [1, 1, 1],
-			typings: ['none', 'none', 'none'],
 		});
 		expect(db.dialect.casing.cache).toEqual(cache);
 	});
@@ -180,7 +179,6 @@ describe('cockroach to camel case', () => {
 			sql:
 				'select "users"."id", "users"."AGE", "users"."firstName" || \' \' || "users"."lastName" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."usesDrizzleOrm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."userId" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2',
 			params: [1, 1],
-			typings: ['none', 'none'],
 		});
 		expect(db.dialect.casing.cache).toEqual(cache);
 	});

drizzle-orm/tests/casing/cockroach-to-snake.test.ts

@@ -154,7 +154,6 @@ describe('cockroach to snake case', () => {
 			sql:
 				'select "users"."id", "users"."AGE", "users"."first_name" || \' \' || "users"."last_name" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."uses_drizzle_orm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."user_id" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2 limit $3',
 			params: [1, 1, 1],
-			typings: ['none', 'none', 'none'],
 		});
 		expect(db.dialect.casing.cache).toEqual(cache);
 	});
@@ -182,7 +181,6 @@ describe('cockroach to snake case', () => {
 			sql:
 				'select "users"."id", "users"."AGE", "users"."first_name" || \' \' || "users"."last_name" as "name", "users_developers"."data" as "developers" from "users" "users" left join lateral (select json_build_array("users_developers"."uses_drizzle_orm") as "data" from (select * from "test"."developers" "users_developers" where "users_developers"."user_id" = "users"."id" limit $1) "users_developers") "users_developers" on true where "users"."id" = $2',
 			params: [1, 1],
-			typings: ['none', 'none'],
 		});
 		expect(db.dialect.casing.cache).toEqual(cache);
 	});