Update github workflows to add multiple postgres dbs

hayes · Jul 30, 2024 · 23dc8ef · 23dc8ef
1 parent f29eecd
commit 23dc8ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/changesets.yml b/.github/workflows/changesets.yml
@@ -30,11 +30,13 @@ jobs:
         env:
           POSTGRES_USER: prisma
           POSTGRES_PASSWORD: prisma
-          POSTGRES_DB: tests
+          POSTGRES_MULTIPLE_DATABASES: tests,drizzle
 
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        volumes:
+          - ./scripts/pg-init-scripts:/docker-entrypoint-initdb.d
 
     steps:
       - name: checkout code repository

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -23,11 +23,13 @@ jobs:
         env:
           POSTGRES_USER: prisma
           POSTGRES_PASSWORD: prisma
-          POSTGRES_DB: tests
+          POSTGRES_MULTIPLE_DATABASES: tests,drizzle
 
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+        volumes:
+          - ./scripts/pg-init-scripts:/docker-entrypoint-initdb.d
 
     strategy:
       matrix:

diff --git a/packages/plugin-drizzle/src/types.ts b/packages/plugin-drizzle/src/types.ts
@@ -432,7 +432,7 @@ export type QueryForRelatedConnection<
   DBQueryConfig<'many', false, Types['DrizzleRelationSchema'], Table>,
   'orderBy' | 'limit' | 'offset' | 'columns' | 'extra' | 'with'
 > & {
-  orderBy: ConnectionOrderBy | ((columns: Table['columns']) => ConnectionOrderBy);
+  orderBy?: ConnectionOrderBy | ((columns: Table['columns']) => ConnectionOrderBy);
 } extends infer QueryConfig
   ? QueryConfig | ((args: Args, context: Types['Context']) => QueryConfig)
   : never;
@@ -444,7 +444,7 @@ export type QueryForDrizzleConnection<
   DBQueryConfig<'many', false, Types['DrizzleRelationSchema'], Table>,
   'orderBy' | 'limit' | 'offset'
 > & {
-  orderBy: ConnectionOrderBy | ((columns: Table['columns']) => ConnectionOrderBy);
+  orderBy?: ConnectionOrderBy | ((columns: Table['columns']) => ConnectionOrderBy);
 };
 
 export type ListRelation<T extends TableRelationalConfig> = {