Merge pull request #320 from drizzle-team/beta

dankochetov · web-flow · commit 88be5f8dd997 · 2023-03-27T14:37:24.000+03:00
diff --git a/changelogs/drizzle-orm/0.23.2.md b/changelogs/drizzle-orm/0.23.2.md
@@ -0,0 +1 @@
+- 🐛 Rolled back some breaking changes for drizzle-kit
diff --git a/drizzle-orm/package.json b/drizzle-orm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "0.23.1",
+  "version": "0.23.2",
   "description": "Drizzle ORM package for SQL databases",
   "scripts": {
     "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",
diff --git a/drizzle-orm/src/mysql-core/dialect.ts b/drizzle-orm/src/mysql-core/dialect.ts
@@ -143,7 +143,7 @@ export class MySqlDialect {
 					if (isSingleTable) {
 						chunk.push(
 							new SQL(
-								query.chunks.map((c) => {
+								query.queryChunks.map((c) => {
 									if (c instanceof MySqlColumn) {
 										return new Name(c.name);
 									}
diff --git a/drizzle-orm/src/pg-core/dialect.ts b/drizzle-orm/src/pg-core/dialect.ts
@@ -134,7 +134,7 @@ export class PgDialect {
 					if (isSingleTable) {
 						chunk.push(
 							new SQL(
-								query.chunks.map((c) => {
+								query.queryChunks.map((c) => {
 									if (c instanceof PgColumn) {
 										return new Name(c.name);
 									}
diff --git a/drizzle-orm/src/sql/index.ts b/drizzle-orm/src/sql/index.ts
@@ -59,7 +59,7 @@ function mergeQueries(queries: Query[]): Query {
 	return result;
 }
 
-class StringChunk {
+export class StringChunk {
 	readonly value: string[];
 
 	constructor(value: string | string[]) {
@@ -77,15 +77,15 @@ export class SQL<T = unknown> implements SQLWrapper {
 	decoder: DriverValueDecoder<T, any> = noopDecoder;
 	private shouldInlineParams = false;
 
-	constructor(readonly chunks: SQLChunk[]) {}
+	constructor(readonly queryChunks: SQLChunk[]) {}
 
 	append(query: SQL): this {
-		this.chunks.push(...query.chunks);
+		this.queryChunks.push(...query.queryChunks);
 		return this;
 	}
 
 	toQuery(config: BuildQueryConfig): Query {
-		return this.buildQueryFromSourceParams(this.chunks, config);
+		return this.buildQueryFromSourceParams(this.queryChunks, config);
 	}
 
 	buildQueryFromSourceParams(chunks: SQLChunk[], _config: BuildQueryConfig): Query {
@@ -129,7 +129,7 @@ export class SQL<T = unknown> implements SQLWrapper {
 			}
 
 			if (chunk instanceof SQL) {
-				return this.buildQueryFromSourceParams(chunk.chunks, {
+				return this.buildQueryFromSourceParams(chunk.queryChunks, {
 					...config,
 					inlineParams: inlineParams || chunk.shouldInlineParams,
 				});
diff --git a/drizzle-orm/src/sqlite-core/columns/integer.ts b/drizzle-orm/src/sqlite-core/columns/integer.ts
@@ -17,7 +17,7 @@ export interface PrimaryKeyConfig {
 	onConflict?: OnConflict;
 }
 
-export abstract class SQLiteIntegerBaseBuilder<
+export abstract class SQLiteBaseIntegerBuilder<
 	THKT extends ColumnBuilderHKTBase,
 	T extends ColumnBuilderBaseConfig,
 > extends SQLiteColumnBuilder<THKT, T, { autoIncrement: boolean }> {
@@ -39,18 +39,18 @@ export abstract class SQLiteIntegerBaseBuilder<
 	/** @internal */
 	abstract override build<TTableName extends string>(
 		table: AnySQLiteTable<{ name: TTableName }>,
-	): SQLiteIntegerBase<Assume<THKT['_columnHKT'], ColumnHKTBase>, MakeColumnConfig<T, TTableName>>;
+	): SQLiteBaseInteger<Assume<THKT['_columnHKT'], ColumnHKTBase>, MakeColumnConfig<T, TTableName>>;
 }
 
-export abstract class SQLiteIntegerBase<
+export abstract class SQLiteBaseInteger<
 	THKT extends ColumnHKTBase,
 	T extends ColumnBaseConfig,
 > extends SQLiteColumn<THKT, T> {
 	readonly autoIncrement: boolean;
 
 	constructor(
 		override readonly table: AnySQLiteTable<{ name: T['tableName'] }>,
-		config: SQLiteIntegerBaseBuilder<ColumnBuilderHKTBase, T>['config'],
+		config: SQLiteBaseIntegerBuilder<ColumnBuilderHKTBase, T>['config'],
 	) {
 		super(table, config);
 		this.autoIncrement = config.autoIncrement;
@@ -79,7 +79,7 @@ export type SQLiteIntegerBuilderInitial<TName extends string> = SQLiteIntegerBui
 }>;
 
 export class SQLiteIntegerBuilder<T extends ColumnBuilderBaseConfig>
-	extends SQLiteIntegerBaseBuilder<SQLiteIntegerBuilderHKT, T>
+	extends SQLiteBaseIntegerBuilder<SQLiteIntegerBuilderHKT, T>
 {
 	build<TTableName extends string>(
 		table: AnySQLiteTable<{ name: TTableName }>,
@@ -88,7 +88,7 @@ export class SQLiteIntegerBuilder<T extends ColumnBuilderBaseConfig>
 	}
 }
 
-export class SQLiteInteger<T extends ColumnBaseConfig> extends SQLiteIntegerBase<SQLiteIntegerHKT, T> {}
+export class SQLiteInteger<T extends ColumnBaseConfig> extends SQLiteBaseInteger<SQLiteIntegerHKT, T> {}
 
 export interface SQLiteTimestampBuilderHKT extends ColumnBuilderHKTBase {
 	_type: SQLiteTimestampBuilder<Assume<this['config'], ColumnBuilderBaseConfig>>;
@@ -108,7 +108,7 @@ export type SQLiteTimestampBuilderInitial<TName extends string> = SQLiteTimestam
 }>;
 
 export class SQLiteTimestampBuilder<T extends ColumnBuilderBaseConfig>
-	extends SQLiteIntegerBaseBuilder<SQLiteTimestampBuilderHKT, T>
+	extends SQLiteBaseIntegerBuilder<SQLiteTimestampBuilderHKT, T>
 {
 	/**
 	 * @deprecated Use `defaultCurrentTimestamp()` or `default()` with your own expression instead.
@@ -133,7 +133,7 @@ export class SQLiteTimestampBuilder<T extends ColumnBuilderBaseConfig>
 	}
 }
 
-export class SQLiteTimestamp<T extends ColumnBaseConfig> extends SQLiteIntegerBase<SQLiteTimestampHKT, T> {
+export class SQLiteTimestamp<T extends ColumnBaseConfig> extends SQLiteBaseInteger<SQLiteTimestampHKT, T> {
 	override mapFromDriverValue(value: number): Date {
 		return new Date(value);
 	}
diff --git a/drizzle-orm/src/sqlite-core/dialect.ts b/drizzle-orm/src/sqlite-core/dialect.ts
@@ -98,7 +98,7 @@ export abstract class SQLiteDialect {
 					if (isSingleTable) {
 						chunk.push(
 							new SQL(
-								query.chunks.map((c) => {
+								query.queryChunks.map((c) => {
 									if (c instanceof SQLiteColumn) {
 										return new Name(c.name);
 									}
diff --git a/drizzle-orm/src/version.ts b/drizzle-orm/src/version.ts
@@ -1,2 +1,2 @@
-export const compatibilityVersion = 3;
+export const compatibilityVersion = 4;
 export const npmVersion: string = require('./package.json').version;
diff --git a/tsconfig.json b/tsconfig.json
@@ -33,8 +33,7 @@
 		"allowUnusedLabels": false /* Disable error reporting for unused labels. */,
 		"allowUnreachableCode": false /* Disable error reporting for unreachable code. */,
 		"skipLibCheck": true /* Skip type checking all .d.ts files. */,
-		"noErrorTruncation": true /* Disable truncating types in error messages. */,
-		"importsNotUsedAsValues": "error" /* Specify emit/checking behavior for imports that are only used for types */
+		"noErrorTruncation": true /* Disable truncating types in error messages. */
 	},
 	"exclude": ["**/dist"],
 	"ts-node": {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+- 🐛 Rolled back some breaking changes for drizzle-kit`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "drizzle-orm",`
`3`		`- "version": "0.23.1",`
	`3`	`+ "version": "0.23.2",`
`4`	`4`	`"description": "Drizzle ORM package for SQL databases",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ export class MySqlDialect {`
`143`	`143`	`if (isSingleTable) {`
`144`	`144`	`chunk.push(`
`145`	`145`	`new SQL(`
`146`		`- query.chunks.map((c) => {`
	`146`	`+ query.queryChunks.map((c) => {`
`147`	`147`	`if (c instanceof MySqlColumn) {`
`148`	`148`	`return new Name(c.name);`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ export class PgDialect {`
`134`	`134`	`if (isSingleTable) {`
`135`	`135`	`chunk.push(`
`136`	`136`	`new SQL(`
`137`		`- query.chunks.map((c) => {`
	`137`	`+ query.queryChunks.map((c) => {`
`138`	`138`	`if (c instanceof PgColumn) {`
`139`	`139`	`return new Name(c.name);`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export abstract class SQLiteDialect {`
`98`	`98`	`if (isSingleTable) {`
`99`	`99`	`chunk.push(`
`100`	`100`	`new SQL(`
`101`		`- query.chunks.map((c) => {`
	`101`	`+ query.queryChunks.map((c) => {`
`102`	`102`	`if (c instanceof SQLiteColumn) {`
`103`	`103`	`return new Name(c.name);`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-export const compatibilityVersion = 3;`
	`1`	`+export const compatibilityVersion = 4;`
`2`	`2`	`export const npmVersion: string = require('./package.json').version;`