Merge branch 'main' into fix-alg-typo

.github/workflows/release-feature-branch.yaml

@@ -115,6 +115,7 @@ jobs:
           PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}
           NEON_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
           XATA_API_KEY: ${{ secrets.XATA_API_KEY }}
+          XATA_BRANCH: ${{ secrets.XATA_BRANCH }}
           LIBSQL_URL: file:local.db
         run: |
           if [[ ${{ github.event_name }} != "push" && "${{ github.event.pull_request.head.repo.full_name }}" != "${{ github.repository }}" ]]; then

changelogs/drizzle-orm/0.30.10.md

@@ -0,0 +1,17 @@
+## New Features
+
+### 🎉 `.if()` function added to all WHERE expressions
+
+#### Select all users after cursors if a cursor value was provided
+
+```ts
+function getUsersAfter(cursor?: number) {
+    return db.select().from(users).where(
+        gt(users.id, cursor).if(cursor)
+    );
+}
+```
+
+## Bug Fixes
+
+- Fixed internal mappings for sessions `.all`, `.values`, `.execute` functions in AWS DataAPI

changelogs/drizzle-orm/0.30.7.md

@@ -0,0 +1,4 @@
+## Bug fixes
+
+- Add mappings for `@vercel/postgres` package
+- Fix interval mapping for `neon` drivers - #1542

changelogs/drizzle-orm/0.30.8.md

@@ -0,0 +1,16 @@
+- 🎉 Added custom schema support to enums in Postgres (fixes #669 via #2048):
+
+  ```ts
+  import { pgSchema } from 'drizzle-orm/pg-core';
+
+  const mySchema = pgSchema('mySchema');
+  const colors = mySchema.enum('colors', ['red', 'green', 'blue']);
+  ```
+
+- 🎉 Changed D1 `migrate()` function to use batch API (#2137)
+- 🐛 Split `where` clause in Postgres `.onConflictDoUpdate` method into `setWhere` and `targetWhere` clauses, to support both `where` cases in `on conflict ...` clause (fixes #1628, #1302 via #2056)
+- 🐛 Fixed query generation for `where` clause in Postgres `.onConflictDoNothing` method, as it was placed in a wrong spot (fixes #1628 via #2056)
+- 🐛 Fixed multiple issues with AWS Data API driver (fixes #1931, #1932, #1934, #1936 via #2119)
+- 🐛 Fix inserting and updating array values in AWS Data API (fixes #1912 via #1911)
+
+Thanks @hugo082 and @livingforjesus!

changelogs/drizzle-orm/0.30.9.md

@@ -0,0 +1,3 @@
+- 🐛 Fixed migrator in AWS Data API
+- Added `setWhere` and `targetWhere` fields to `.onConflictDoUpdate()` config in SQLite instead of single `where` field
+- 🛠️ Added schema information to Drizzle instances via `db._.fullSchema`

dprint.json

@@ -20,7 +20,8 @@
 		"**/drizzle2/**/meta",
 		"**/*snapshot.json",
 		"**/_journal.json",
-		"**/tsup.config*.mjs"
+		"**/tsup.config*.mjs",
+		"**/.sst"
 	],
 	"plugins": [
 		"https://plugins.dprint.dev/typescript-0.83.0.wasm",

drizzle-orm/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-orm",
-	"version": "0.30.6",
+	"version": "0.30.10",
 	"description": "Drizzle ORM package for SQL databases",
 	"type": "module",
 	"scripts": {
@@ -45,6 +45,7 @@
 	"peerDependencies": {
 		"@aws-sdk/client-rds-data": ">=3",
 		"@cloudflare/workers-types": ">=3",
+		"@electric-sql/pglite": ">=0.1.1",
 		"@libsql/client": "*",
 		"@neondatabase/serverless": ">=0.1",
 		"@op-engineering/op-sqlite": ">=2",
@@ -54,7 +55,7 @@
 		"@types/pg": "*",
 		"@types/react": ">=18",
 		"@types/sql.js": "*",
-		"@vercel/postgres": "*",
+		"@vercel/postgres": ">=0.8.0",
 		"@xata.io/client": "*",
 		"better-sqlite3": ">=7",
 		"bun-types": "*",
@@ -66,8 +67,7 @@
 		"postgres": ">=3",
 		"react": ">=18",
 		"sql.js": ">=1",
-		"sqlite3": ">=5",
-		"@electric-sql/pglite": ">=0.1.1"
+		"sqlite3": ">=5"
 	},
 	"peerDependenciesMeta": {
 		"mysql2": {
@@ -147,7 +147,7 @@
 		}
 	},
 	"devDependencies": {
-		"@aws-sdk/client-rds-data": "^3.344.0",
+		"@aws-sdk/client-rds-data": "^3.549.0",
 		"@cloudflare/workers-types": "^4.20230904.0",
 		"@electric-sql/pglite": "^0.1.1",
 		"@libsql/client": "^0.5.6",
@@ -161,7 +161,7 @@
 		"@types/pg": "^8.10.1",
 		"@types/react": "^18.2.45",
 		"@types/sql.js": "^1.4.4",
-		"@vercel/postgres": "^0.3.0",
+		"@vercel/postgres": "^0.8.0",
 		"@xata.io/client": "^0.29.3",
 		"better-sqlite3": "^8.4.0",
 		"bun-types": "^0.6.6",

drizzle-orm/src/aws-data-api/common/index.ts

@@ -20,6 +20,19 @@ export function getValueFromDataApi(field: Field) {
 		if (field.arrayValue.stringValues !== undefined) {
 			return field.arrayValue.stringValues;
 		}
+		if (field.arrayValue.longValues !== undefined) {
+			return field.arrayValue.longValues;
+		}
+		if (field.arrayValue.doubleValues !== undefined) {
+			return field.arrayValue.doubleValues;
+		}
+		if (field.arrayValue.booleanValues !== undefined) {
+			return field.arrayValue.booleanValues;
+		}
+		if (field.arrayValue.arrayValues !== undefined) {
+			return field.arrayValue.arrayValues;
+		}
+
 		throw new Error('Unknown array type');
 	} else {
 		throw new Error('Unknown type');

drizzle-orm/src/aws-data-api/pg/driver.ts

@@ -1,16 +1,21 @@
-import { entityKind } from '~/entity.ts';
+import { entityKind, is } from '~/entity.ts';
+import type { SQL, SQLWrapper } from '~/index.ts';
+import { Param, sql, Table } from '~/index.ts';
 import type { Logger } from '~/logger.ts';
 import { DefaultLogger } from '~/logger.ts';
 import { PgDatabase } from '~/pg-core/db.ts';
 import { PgDialect } from '~/pg-core/dialect.ts';
+import type { PgColumn, PgInsertConfig, PgTable, TableConfig } from '~/pg-core/index.ts';
+import { PgArray } from '~/pg-core/index.ts';
+import type { PgRaw } from '~/pg-core/query-builders/raw.ts';
 import {
 	createTableRelationsHelpers,
 	extractTablesRelationalConfig,
 	type RelationalSchemaConfig,
 	type TablesRelationalConfig,
 } from '~/relations.ts';
-import type { DrizzleConfig } from '~/utils.ts';
-import type { AwsDataApiClient, AwsDataApiPgQueryResultHKT } from './session.ts';
+import type { DrizzleConfig, UpdateSet } from '~/utils.ts';
+import type { AwsDataApiClient, AwsDataApiPgQueryResult, AwsDataApiPgQueryResultHKT } from './session.ts';
 import { AwsDataApiSession } from './session.ts';
 
 export interface PgDriverOptions {
@@ -28,16 +33,63 @@ export interface DrizzleAwsDataApiPgConfig<
 	secretArn: string;
 }
 
-export type AwsDataApiPgDatabase<
+export class AwsDataApiPgDatabase<
 	TSchema extends Record<string, unknown> = Record<string, never>,
-> = PgDatabase<AwsDataApiPgQueryResultHKT, TSchema>;
+> extends PgDatabase<AwsDataApiPgQueryResultHKT, TSchema> {
+	static readonly [entityKind]: string = 'AwsDataApiPgDatabase';
+
+	override execute<
+		TRow extends Record<string, unknown> = Record<string, unknown>,
+	>(query: SQLWrapper): PgRaw<AwsDataApiPgQueryResult<TRow>> {
+		return super.execute(query);
+	}
+}
 
 export class AwsPgDialect extends PgDialect {
 	static readonly [entityKind]: string = 'AwsPgDialect';
 
 	override escapeParam(num: number): string {
 		return `:${num + 1}`;
 	}
+
+	override buildInsertQuery(
+		{ table, values, onConflict, returning }: PgInsertConfig<PgTable<TableConfig>>,
+	): SQL<unknown> {
+		const columns: Record<string, PgColumn> = table[Table.Symbol.Columns];
+		const colEntries: [string, PgColumn][] = Object.entries(columns);
+		for (const value of values) {
+			for (const [fieldName, col] of colEntries) {
+				const colValue = value[fieldName];
+				if (
+					is(colValue, Param) && colValue.value !== undefined && is(colValue.encoder, PgArray)
+					&& Array.isArray(colValue.value)
+				) {
+					value[fieldName] = sql`cast(${col.mapToDriverValue(colValue.value)} as ${
+						sql.raw(colValue.encoder.getSQLType())
+					})`;
+				}
+			}
+		}
+
+		return super.buildInsertQuery({ table, values, onConflict, returning });
+	}
+
+	override buildUpdateSet(table: PgTable<TableConfig>, set: UpdateSet): SQL<unknown> {
+		const columns: Record<string, PgColumn> = table[Table.Symbol.Columns];
+
+		for (const [colName, colValue] of Object.entries(set)) {
+			const currentColumn = columns[colName];
+			if (
+				currentColumn && is(colValue, Param) && colValue.value !== undefined && is(colValue.encoder, PgArray)
+				&& Array.isArray(colValue.value)
+			) {
+				set[colName] = sql`cast(${currentColumn?.mapToDriverValue(colValue.value)} as ${
+					sql.raw(colValue.encoder.getSQLType())
+				})`;
+			}
+		}
+		return super.buildUpdateSet(table, set);
+	}
 }
 
 export function drizzle<TSchema extends Record<string, unknown> = Record<string, never>>(