Merge branch 'main' into validator-fix

drizzle-team · Sep 10, 2024 · 60778a5 · 60778a5
2 parents 8900997 + c8359a1
commit 60778a5
Show file tree

Hide file tree

Showing 361 changed files with 76,810 additions and 48,780 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -6,3 +6,6 @@ examples
 **/*.mjs
 **/*.cjs
 **/playground
+integration-tests/tests/prisma/*/client
+integration-tests/tests/prisma/*/drizzle
+drizzle-kit/*
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -10,7 +10,17 @@ plugins:
   - import
   - unused-imports
   - no-instanceof
-  - drizzle
+  - drizzle-internal
+overrides:
+  - files:
+      - '**/tests/**/*.ts'
+      - '**/type-tests/**/*.ts'
+    rules:
+      import/extensions: 'off'
+      no-instanceof: 'off'
+  - files: 'eslint-plugin-drizzle/**/*'
+    rules:
+      import/extensions: 'off'
 rules:
   '@typescript-eslint/consistent-type-imports':
     - error
@@ -24,6 +34,10 @@ rules:
   import/no-useless-path-segments: error
   import/newline-after-import: error
   import/no-duplicates: error
+  import/extensions:
+    - error
+    - always
+    - ignorePackages: true
   '@typescript-eslint/no-explicit-any': 'off'
   '@typescript-eslint/no-non-null-assertion': 'off'
   '@typescript-eslint/no-namespace': 'off'
@@ -61,7 +75,7 @@ rules:
   'unicorn/relative-url-style': 'off'
   'eqeqeq': 'error'
   'no-instanceof/no-instanceof': 'error'
-  'drizzle/require-entity-kind': 'error'
+  'drizzle-internal/require-entity-kind': 'error'
   'unicorn/prefer-string-replace-all': 'off'
   'unicorn/no-process-exit': 'off'
   '@typescript-eslint/ban-ts-comment': 'off'

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/release-feature-branch.yaml b/.github/workflows/release-feature-branch.yaml
@@ -14,6 +14,7 @@ jobs:
       matrix:
         package:
           - drizzle-orm
+          - drizzle-kit
           - drizzle-zod
           - drizzle-typebox
           - drizzle-valibot
@@ -61,7 +62,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 5432:5432
+          - 55433:5432
       mysql:
         image: mysql:8
         env:
@@ -73,13 +74,13 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 3306:3306
+          - 33306:3306
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: '18.18'
           registry-url: 'https://registry.npmjs.org'
 
       - uses: pnpm/action-setup@v3
@@ -131,15 +132,19 @@ jobs:
       - name: Build
         if: steps.checks.outputs.has_new_release == 'true'
         run: |
+          (
+            cd drizzle-orm
+            pnpm prisma generate --schema src/prisma/schema.prisma
+          )
           pnpm build
 
       - name: Run tests
         if: steps.checks.outputs.has_new_release == 'true'
         env:
-          PG_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/drizzle
+          PG_CONNECTION_STRING: postgres://postgres:postgres@localhost:55433/drizzle
           PG_VECTOR_CONNECTION_STRING: postgres://postgres:postgres@localhost:54321/drizzle
           PG_POSTGIS_CONNECTION_STRING: postgres://postgres:postgres@localhost:54322/drizzle
-          MYSQL_CONNECTION_STRING: mysql://root:root@localhost:3306/drizzle
+          MYSQL_CONNECTION_STRING: mysql://root:root@localhost:33306/drizzle
           PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}
           NEON_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
           TIDB_CONNECTION_STRING: ${{ secrets.TIDB_CONNECTION_STRING }}

diff --git a/.github/workflows/release-latest.yaml b/.github/workflows/release-latest.yaml
@@ -10,6 +10,7 @@ jobs:
       matrix:
         package:
           - drizzle-orm
+          - drizzle-kit
           - drizzle-zod
           - drizzle-typebox
           - drizzle-valibot
@@ -54,7 +55,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 5432:5432
+          - 55433:5432
       mysql:
         image: mysql:8
         env:
@@ -66,13 +67,13 @@ jobs:
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 3306:3306
+          - 33306:3306
     steps:
       - uses: actions/checkout@v4
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: '18.18'
           registry-url: 'https://registry.npmjs.org'
 
       - uses: pnpm/action-setup@v3
@@ -134,15 +135,19 @@ jobs:
       - name: Build
         if: steps.checks.outputs.has_new_release == 'true'
         run: |
+          (
+            cd drizzle-orm
+            pnpm prisma generate --schema src/prisma/schema.prisma
+          )
           pnpm build
 
       - name: Run tests
         if: steps.checks.outputs.has_new_release == 'true'
         env:
-          PG_CONNECTION_STRING: postgres://postgres:postgres@localhost:5432/drizzle
+          PG_CONNECTION_STRING: postgres://postgres:postgres@localhost:55433/drizzle
           PG_VECTOR_CONNECTION_STRING: postgres://postgres:postgres@localhost:54321/drizzle
           PG_POSTGIS_CONNECTION_STRING: postgres://postgres:postgres@localhost:54322/drizzle
-          MYSQL_CONNECTION_STRING: mysql://root:root@localhost:3306/drizzle
+          MYSQL_CONNECTION_STRING: mysql://root:root@localhost:33306/drizzle
           PLANETSCALE_CONNECTION_STRING: ${{ secrets.PLANETSCALE_CONNECTION_STRING }}
           NEON_CONNECTION_STRING: ${{ secrets.NEON_CONNECTION_STRING }}
           TIDB_CONNECTION_STRING: ${{ secrets.TIDB_CONNECTION_STRING }}
@@ -222,3 +227,35 @@ jobs:
             } catch (e) {
               core.setFailed(e.message);
             }
+
+      - name: Create GitHub release for KIT package
+        uses: actions/github-script@v6
+        if: matrix.package == 'drizzle-kit' && steps.checks.outputs.has_new_release == 'true'
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            try {
+              const fs = require("fs");
+              const path = require("path");
+
+              const version = "${{ steps.checks.outputs.version }}";
+              const changelog = fs.readFileSync("${{ steps.checks.outputs.changelog_path }}", "utf8");
+
+              const release = await github.rest.repos.createRelease({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                tag_name: `drizzle-kit@${version}`,
+                name: `drizzle-kit@${version}`,
+                body: changelog,
+              });
+
+              await github.rest.repos.uploadReleaseAsset({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                release_id: release.data.id,
+                name: `${{ matrix.package }}-${version}-dist.tgz`,
+                data: fs.readFileSync(path.resolve("${{ matrix.package }}", "package.tgz")),
+              });
+            } catch (e) {
+              core.setFailed(e.message);
+            }
diff --git a/.github/workflows/unpublish-release-feature-branch.yaml b/.github/workflows/unpublish-release-feature-branch.yaml
@@ -9,6 +9,7 @@ jobs:
       matrix:
         package:
           - drizzle-orm
+          - drizzle-kit
           - drizzle-zod
           - drizzle-typebox
           - drizzle-valibot
@@ -19,7 +20,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: '18.18'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Unpublish

diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,5 @@ dist.new
 .rollup.cache
 dist-dts
 rollup.config-*.mjs
+*.log
+.DS_Store