feat(nuxt): drizzle query schema support

oku-ui · Jan 22, 2024 · dc72c49 · dc72c49
1 parent 97ea85d
commit dc72c49
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,4 +21,5 @@ coverage
 lib
 dist
 .nx
-.eslintcache
+.eslintcache
+pergel
diff --git a/packages/nuxt/playground/pergel/.env.template b/packages/nuxt/playground/pergel/.env.template
@@ -10,6 +10,7 @@ NUXT_TEST_DRIZZLE_PG_PASSWORD=postgres
 NUXT_TEST_DRIZZLE_PG_SSL=false
 NUXT_TEST_DRIZZLE_PG_DROP=false
 NUXT_TEST_DRIZZLE_PG_SEED=false
+NUXT_TEST_DRIZZLE_PG_MIGRATE=false
 
 # test/bullmq
 NUXT_TEST_BULLMQ_OPTIONS_HOST=localhost

diff --git a/packages/nuxt/playground/pergel/README.json b/packages/nuxt/playground/pergel/README.json
@@ -1,7 +1,7 @@
 {
   "pergel": {
     "comment-block-1": "This file is generated by pergel. Do not edit it manually.",
-    "comment-block-2": "Version: 0.7.14"
+    "comment-block-2": "Version: 0.7.17"
   },
   "test": {
     "lucia": {
@@ -45,7 +45,8 @@
         "NUXT_TEST_DRIZZLE_PG_PASSWORD": "postgres",
         "NUXT_TEST_DRIZZLE_PG_SSL": false,
         "NUXT_TEST_DRIZZLE_PG_DROP": false,
-        "NUXT_TEST_DRIZZLE_PG_SEED": false
+        "NUXT_TEST_DRIZZLE_PG_SEED": false,
+        "NUXT_TEST_DRIZZLE_PG_MIGRATE": false
       },
       "packageJson": {
         "dependencies": {

diff --git a/packages/nuxt/src/runtime/modules/drizzle/drivers/postgres/export.ts b/packages/nuxt/src/runtime/modules/drizzle/drivers/postgres/export.ts
@@ -13,6 +13,7 @@ export async function connectPostgresJS(this: PergelGlobalContextOmitModule, ctx
   options?: PostgresJSOptions
   event?: H3Event
   pergel?: PergelGlobalContextOmitModule
+  config?: Parameters<typeof drizzle>[1]
 }) {
   const _pergel = ctx.pergel ?? this
 
@@ -21,13 +22,13 @@ export async function connectPostgresJS(this: PergelGlobalContextOmitModule, ctx
 
   const { client } = await clientInit(_pergel, (runtime) => {
     if (runtime.url)
-      return drizzle(postgres(runtime.url, {}))
+      return drizzle(postgres(runtime.url, {}), ctx.config)
 
     else if (process.env.POSTGRES_URL)
-      return drizzle(postgres(process.env.POSTGRES_URL, ctx.options?.options))
+      return drizzle(postgres(process.env.POSTGRES_URL, ctx.options?.options), ctx.config)
 
     else if (ctx.options?.options)
-      return drizzle(postgres(ctx.options.options))
+      return drizzle(postgres(ctx.options.options), ctx.config)
 
     else
       throw new Error('PostgresJS is not defined')

diff --git a/themes/pergel-auth/pergel/README.json b/themes/pergel-auth/pergel/README.json
@@ -1,7 +1,7 @@
 {
   "pergel": {
     "comment-block-1": "This file is generated by pergel. Do not edit it manually.",
-    "comment-block-2": "Version: 0.7.14"
+    "comment-block-2": "Version: 0.7.17"
   },
   "changeName": {
     "lucia": {
@@ -45,7 +45,8 @@
         "NUXT_CHANGE_NAME_DRIZZLE_PG_PASSWORD": "postgres",
         "NUXT_CHANGE_NAME_DRIZZLE_PG_SSL": false,
         "NUXT_CHANGE_NAME_DRIZZLE_PG_DROP": false,
-        "NUXT_CHANGE_NAME_DRIZZLE_PG_SEED": false
+        "NUXT_CHANGE_NAME_DRIZZLE_PG_SEED": false,
+        "NUXT_CHANGE_NAME_DRIZZLE_PG_MIGRATE": false
       },
       "packageJson": {
         "dependencies": {

diff --git a/themes/pergel-ionic/pergel/README.json b/themes/pergel-ionic/pergel/README.json
@@ -1,7 +1,7 @@
 {
   "pergel": {
     "comment-block-1": "This file is generated by pergel. Do not edit it manually.",
-    "comment-block-2": "Version: 0.7.14"
+    "comment-block-2": "Version: 0.7.17"
   },
   "changeName": {
     "box": {