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

Author: AndriiSherman

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

@@ -1,10 +1,28 @@
 name: Release (feature branch)
 
 on:
-  push:
-    branches-ignore:
-      - main
-  pull_request: {}
+  workflow_call:
+    secrets:
+      PLANETSCALE_CONNECTION_STRING:
+        required: true
+      NEON_CONNECTION_STRING:
+        required: true
+      NEON_HTTP_CONNECTION_STRING:
+        required: true
+      TIDB_CONNECTION_STRING:
+        required: true
+      XATA_API_KEY:
+        required: true
+      XATA_BRANCH:
+        required: true
+      LIBSQL_REMOTE_URL:
+        required: true
+      LIBSQL_REMOTE_TOKEN:
+        required: true
+      SQLITE_CLOUD_CONNECTION_STRING:
+        required: true
+      SQLITE_MANY_CLOUD_CONNECTION_STRING:
+        required: true
 
 concurrency:
   group: feature-${{ github.workflow }}-${{ github.ref }}
@@ -33,42 +51,6 @@ jobs:
         run: pnpm prisma generate --schema src/prisma/schema.prisma
       - name: Build all
         run: pnpm build:artifact
-
-      # has to be after build step, otherwise turbo cache miss
-      - name: Apply version suffix to packages
-        shell: bash
-        run: |
-          set -euxo pipefail
-          suffix=$(git rev-parse --short HEAD)
-
-          packages=(
-            "drizzle-orm"
-            "drizzle-kit"
-            "drizzle-zod"
-            "drizzle-seed"
-            "drizzle-typebox"
-            "drizzle-valibot"
-            "drizzle-arktype"
-            "eslint-plugin-drizzle"
-          )
-
-          for pkg in "${packages[@]}"; do
-            pkg_dir="$pkg/dist"
-            package_json="$pkg_dir/package.json"
-
-            if [[ ! -f "$package_json" ]]; then
-              echo "WARN: $package_json not found, skipping"
-              continue
-            fi
-
-            base_version="$(jq -r '.version' "$package_json")"
-            new_version="${base_version}-${suffix}"
-
-            echo "Setting $pkg dist version to $new_version"
-            jq --arg v "$new_version" '.version = $v' "$package_json" > "$package_json.tmp"
-            mv "$package_json.tmp" "$package_json"
-          done
-      # Upload compiled JS for tests to reuse
       - name: Upload build-dist
         uses: actions/upload-artifact@v4
         with:
@@ -231,9 +213,12 @@ jobs:
           LIBSQL_REMOTE_TOKEN: ${{ secrets.LIBSQL_REMOTE_TOKEN }}
           GEL_CONNECTION_STRING: gel://admin:password@localhost:56565/main
           SINGLESTORE_CONNECTION_STRING: singlestore://root:singlestore@localhost:33307/
+          SINGLESTORE_MANY_CONNECTION_STRING: singlestore://root:singlestore@localhost:3308/;singlestore://root:singlestore@localhost:3309/;singlestore://root:singlestore@localhost:3310/;singlestore://root:singlestore@localhost:3311/
           COCKROACH_CONNECTION_STRING: postgresql://[email protected]:26257/defaultdb?sslmode=disable
           MSSQL_CONNECTION_STRING: mssql://SA:drizzle123PASSWORD!@localhost:1433?encrypt=true&trustServerCertificate=true
           TEST_CONFIG_PATH_PREFIX: ./tests/cli/
+          SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
+          SQLITE_MANY_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_MANY_CLOUD_CONNECTION_STRING }}
         working-directory: integration-tests
         shell: bash
         run: |
@@ -307,9 +292,6 @@ jobs:
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
     runs-on: ubuntu-24.04
     timeout-minutes: 20
-    strategy:
-      matrix:
-        package: [drizzle-kit, drizzle-zod, drizzle-seed, drizzle-typebox, drizzle-valibot, drizzle-arktype, eslint-plugin-drizzle]
     steps:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
@@ -324,8 +306,14 @@ jobs:
           name: packages
           path: ./artifacts
       - name: Run @arethetypeswrong/cli
-        working-directory: ${{ matrix.package }}
-        run: bun --bun run ../attw-fork/src/run.ts ../artifacts/${{ matrix.package }}/package.tgz
+        run: |
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/drizzle-kit/package.tgz
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/drizzle-zod/package.tgz
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/drizzle-seed/package.tgz
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/drizzle-typebox/package.tgz
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/drizzle-valibot/package.tgz
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/drizzle-arktype/package.tgz
+          bun --bun run ./attw-fork/src/run.ts ./artifacts/eslint-plugin-drizzle/package.tgz
 
   attw-orm:
     needs: [prepare]
@@ -367,12 +355,13 @@ jobs:
       matrix:
         package: [drizzle-orm, drizzle-kit, drizzle-zod, drizzle-seed, drizzle-typebox, drizzle-valibot, drizzle-arktype, eslint-plugin-drizzle]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       # don't specify registry url, so there's no .npmrc config file
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with: { node-version: '24' }
 
+      # nuke, so npm can use OIDC
       - name: Remove temp npmrc
         run: rm -f "$NPM_CONFIG_USERCONFIG"
 
@@ -389,9 +378,21 @@ jobs:
         shell: bash
         run: |
           set -euxo pipefail
-          version="$(tar -xOf ./artifacts/${{ matrix.package }}/package.tgz package/package.json | jq -r .version)"
-          tag="${{ github.ref_name }}"
           
+          _version="$(tar -xOf ./artifacts/${{ matrix.package }}/package.tgz package/package.json | jq -r .version)"
+          tag="${{ github.ref_name }}"
+          suffix=$(git rev-parse --short HEAD)
+          version="$_version-$suffix"
+          tmpdir="$(mktemp -d)"
+          tar -xzf ./artifacts/${{ matrix.package }}/package.tgz -C "$tmpdir"
+
+          jq --arg v "$version" '.version = $v' \
+            "$tmpdir/package/package.json" > "$tmpdir/package/package.json.tmp"
+            mv "$tmpdir/package/package.json.tmp" "$tmpdir/package/package.json"
+
+          tar -czf ./artifacts/${{ matrix.package }}/package.tgz -C "$tmpdir" package
+          rm -rf "$tmpdir"
+
           is_published="$(npm view ${{ matrix.package }} versions --json | jq -r '.[] | select(. == "'$version'") | . == "'$version'"')"
           if [[ "$is_published" == "true" ]]; then
             echo "\`${{ matrix.package }}@$version\` already published, tagging \`$tag\`" >> $GITHUB_STEP_SUMMARY
@@ -403,5 +404,5 @@ jobs:
         shell: bash
         run: |
           set -euxo pipefail
-          pnpm publish ./artifacts/${{ matrix.package }}/package.tgz --tag "${{ steps.checks.outputs.tag }}"
-          echo "npm: \`${{ matrix.package }}@${{ steps.checks.outputs.tag }} | ${{ steps.checks.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY
+          npm publish ./artifacts/${{ matrix.package }}/package.tgz --tag "${{ steps.checks.outputs.tag }}"
+          echo "npm: \`${{ matrix.package }}@${{ steps.checks.outputs.tag }} | ${{ steps.checks.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY

.github/workflows/release-latest.yaml

@@ -1,6 +1,26 @@
 name: Release (latest)
 
-on: workflow_dispatch
+on:
+  workflow_call:
+    secrets:
+      PLANETSCALE_CONNECTION_STRING:
+        required: true
+      NEON_CONNECTION_STRING:
+        required: true
+      NEON_HTTP_CONNECTION_STRING:
+        required: true
+      TIDB_CONNECTION_STRING:
+        required: true
+      XATA_API_KEY:
+        required: true
+      XATA_BRANCH:
+        required: true
+      LIBSQL_REMOTE_URL:
+        required: true
+      LIBSQL_REMOTE_TOKEN:
+        required: true
+      SQLITE_CLOUD_CONNECTION_STRING:
+        required: true
 
 jobs:
   test:
@@ -81,7 +101,7 @@ jobs:
         ports:
           - 33306:3306
       singlestore:
-        image: ghcr.io/singlestore-labs/singlestoredb-dev:latest
+        image: ghcr.io/singlestore-labs/singlestoredb-dev:0.2.67
         env:
           ROOT_PASSWORD: singlestore
         ports:
@@ -146,7 +166,7 @@ jobs:
           NEON_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
           # NEON_HTTP_CONNECTION_STRING: postgres://postgres:[email protected]:5432/postgres
           NEON_HTTP_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
-          NEON_CONNECTION_STRING: postgres://postgres:postgres@localhost:5445/postgres
+          # NEON_CONNECTION_STRING: postgres://postgres:postgres@localhost:5445/postgres
           TIDB_CONNECTION_STRING: ${{ secrets.TIDB_CONNECTION_STRING }}
           XATA_API_KEY: ${{ secrets.XATA_API_KEY }}
           XATA_BRANCH: ${{ secrets.XATA_BRANCH }}
@@ -157,6 +177,7 @@ jobs:
           COCKROACH_CONNECTION_STRING: postgresql://[email protected]:26257/defaultdb?sslmode=disable
           MSSQL_CONNECTION_STRING: mssql://SA:drizzle123PASSWORD!@localhost:1433?encrypt=true&trustServerCertificate=true
           TEST_CONFIG_PATH_PREFIX: ./tests/cli/
+          SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
         working-directory: integration-tests
         run: |
           case ${{ matrix.shard }} in
@@ -417,7 +438,9 @@ jobs:
         run: bun --bun run ../attw-fork/src/run.ts package.tgz ${{ matrix.shard }}
 
   release:
-    permissions: write-all
+    permissions:
+      contents: read
+      id-token: write
     needs:
       - test
       - attw
@@ -436,12 +459,11 @@ jobs:
           - eslint-plugin-drizzle
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          registry-url: 'https://registry.npmjs.org'
+      # don't specify registry url, so there's no .npmrc config file
+      - uses: actions/setup-node@v6
+        with: { node-version: '24' }
 
       - uses: pnpm/action-setup@v3
         name: Install pnpm
@@ -478,7 +500,6 @@ jobs:
 
           if [[ "$is_version_published" == "true" ]]; then
             echo "\`${{ matrix.package }}@$version\` already published, adding tag \`latest\`" >> $GITHUB_STEP_SUMMARY
-            npm dist-tag add ${{ matrix.package }}@$version latest
           elif [[ "$latest" != "$version" ]]; then
             echo "Latest:  $latest"
             echo "Current: $version"
@@ -512,16 +533,12 @@ jobs:
         if: steps.checks.outputs.has_new_release == 'true'
         working-directory: ${{ matrix.package }}
         shell: bash
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
         run: npm run pack
-
+      
       - name: Publish
         if: steps.checks.outputs.has_new_release == 'true'
         working-directory: ${{ matrix.package }}
         shell: bash
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
         run: |
           version="${{ steps.checks.outputs.version }}"
 

.github/workflows/router.yaml

@@ -0,0 +1,58 @@
+name: Release Router
+
+on:
+  push:
+    branches-ignore:
+      - main
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  switch:
+    runs-on: ubuntu-latest
+    outputs:
+      target: ${{ steps.route.outputs.target }}
+    steps:
+      - name: Route release
+        id: route
+        run: |
+          HEAD_REPO="${{ github.event.pull_request.head.repo.full_name }}"
+          if [[ "$GITHUB_EVENT_NAME" == "workflow_dispatch" && "${GITHUB_REF##*/}" == "main" ]]; then
+            echo "target=latest" >> $GITHUB_OUTPUT
+          # only run on all pushes or pull requests from forks
+          elif [[ "$GITHUB_EVENT_NAME" == "push" ]] || [[ "$HEAD_REPO" != "$GITHUB_REPOSITORY" ]]; then
+            echo "target=feature" >> $GITHUB_OUTPUT
+          else
+            echo "target=skip" >> $GITHUB_OUTPUT
+          fi
+
+  run-feature:
+    needs: switch
+    if: needs.switch.outputs.target == 'feature'
+    uses: ./.github/workflows/release-feature-branch.yaml
+    secrets:
+      PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}
+      NEON_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
+      NEON_HTTP_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
+      TIDB_CONNECTION_STRING: ${{ secrets.TIDB_CONNECTION_STRING }}
+      XATA_API_KEY: ${{ secrets.XATA_API_KEY }}
+      XATA_BRANCH: ${{ secrets.XATA_BRANCH }}
+      LIBSQL_REMOTE_URL: ${{ secrets.LIBSQL_REMOTE_URL }}
+      LIBSQL_REMOTE_TOKEN: ${{ secrets.LIBSQL_REMOTE_TOKEN }}
+      SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}
+      SQLITE_MANY_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_MANY_CLOUD_CONNECTION_STRING }}
+
+  run-latest:
+    needs: switch
+    if: needs.switch.outputs.target == 'latest'
+    uses: ./.github/workflows/release-latest.yaml
+    secrets:
+      PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}
+      NEON_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
+      NEON_HTTP_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
+      TIDB_CONNECTION_STRING: ${{ secrets.TIDB_CONNECTION_STRING }}
+      XATA_API_KEY: ${{ secrets.XATA_API_KEY }}
+      XATA_BRANCH: ${{ secrets.XATA_BRANCH }}
+      LIBSQL_REMOTE_URL: ${{ secrets.LIBSQL_REMOTE_URL }}
+      LIBSQL_REMOTE_TOKEN: ${{ secrets.LIBSQL_REMOTE_TOKEN }}
+      SQLITE_CLOUD_CONNECTION_STRING: ${{ secrets.SQLITE_CLOUD_CONNECTION_STRING }}

.oxlintrc.json

@@ -66,10 +66,15 @@
 		"typescript/no-empty-interface": "off",
 		"typescript/no-unsafe-declaration-merging": "off",
 		"no-inner-declarations": "off",
-		"drizzle-internal/no-instanceof": "error",
 		"drizzle-internal/require-entity-kind": "error"
 	},
 	"overrides": [
+		{
+			"files": ["drizzle-orm/**/*"],
+			"rules": {
+				"drizzle-internal/no-instanceof": "error"
+			}
+		},
 		{
 			"files": [
 				"**/tests/**/*.ts",
@@ -78,7 +83,6 @@
 			],
 			"rules": {
 				"import/extensions": "off",
-				"drizzle-internal/no-instanceof": "off",
 				"no-useless-escape": "off",
 				"consistent-type-imports": "off",
 				"no-unused-vars": "off",

changelogs/drizzle-kit/0.31.6.md

@@ -0,0 +1,3 @@
+### Bug fixes
+
+- [[BUG]: Importing drizzle-kit/api fails in ESM modules](https://github.com/drizzle-team/drizzle-orm/issues/2853)

changelogs/drizzle-kit/0.31.7.md

@@ -0,0 +1,3 @@
+### Bug fixes
+
+- [[BUG]: Drizzle Kit push to Postgres 18 produces unecessary DROP SQL when the schema was NOT changed](https://github.com/drizzle-team/drizzle-orm/issues/4944)

changelogs/drizzle-kit/0.31.8.md

@@ -0,0 +1,3 @@
+### Bug fixes
+
+- Fixed `algorythm` => `algorithm` typo

changelogs/drizzle-orm/0.45.0.md

@@ -0,0 +1,5 @@
+- Fixed pg-native Pool detection in node-postgres transactions  
+- Allowed subqueries in select fields  
+- Updated typo algorythm => algorithm  
+- Fixed `$onUpdate` not handling `SQL` values (fixes [#2388](https://github.com/drizzle-team/drizzle-orm/issues/2388), tests implemented by [L-Mario564](https://github.com/L-Mario564) in [#2911](https://github.com/drizzle-team/drizzle-orm/pull/2911))
+- Fixed `pg` mappers not handling `Date` instances in `bun-sql:postgresql` driver responses for `date`, `timestamp` types (fixes [#4493](https://github.com/drizzle-team/drizzle-orm/issues/4493))