fix: update test environment creation

Author: svetch

packages/cli/test/db/pull.test.ts

@@ -1,14 +1,14 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
-import { createProject, runCli } from '../utils';
+import { createTestEnvironment, runCli } from '../utils';
 
 const getSchema = (workDir: string) => fs.readFileSync(path.join(workDir, 'zenstack/schema.zmodel')).toString();
 
 describe('DB pull', () => {
-    it('simple schema', () => {
-        const workDir = createProject(
-`model User {
+    it('simple schema', async () => {
+        const workDir = await createTestEnvironment(
+            `model User {
     id             String   @id @default(cuid())
     email          String   @unique @map("email_address")
     name           String?  @default("Anonymous")
@@ -85,7 +85,8 @@ enum Role {
     USER
     ADMIN
     MODERATOR
-}`);
+}`,
+        );
         runCli('format', workDir);
         runCli('db push', workDir);
 

packages/cli/test/utils.ts

@@ -1,9 +1,23 @@
 import { createTestProject, getTestDbProvider } from '@zenstackhq/testtools';
-import { createHash } from 'node:crypto';
 import { execSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
 import { expect } from 'vitest';
+import { Client as PostgresClient } from 'pg';
+import { createHash } from 'node:crypto';
+
+const ZMODEL_PRELUDE = `datasource db {
+    provider = "sqlite"
+    url      = "file:./dev.db"
+}
+`;
+export function createProject(zmodel: string, addPrelude = true) {
+    const workDir = createTestProject();
+    fs.mkdirSync(path.join(workDir, 'zenstack'), { recursive: true });
+    const schemaPath = path.join(workDir, 'zenstack/schema.zmodel');
+    fs.writeFileSync(schemaPath, addPrelude ? `${ZMODEL_PRELUDE}\n\n${zmodel}` : zmodel);
+    return workDir;
+}
 
 const TEST_PG_CONFIG = {
     host: process.env['TEST_PG_HOST'] ?? 'localhost',
@@ -34,24 +48,27 @@ function getTestDbName(provider: string) {
     );
 }
 
-export function createProject(zmodel: string, addPrelude = true) {
+export async function createTestEnvironment(zmodel: string, addPrelude = true) {
     const provider = getTestDbProvider() ?? 'sqlite';
     const dbName = getTestDbName(provider);
-    const dbUrl =
-        provider === 'sqlite'
-            ? `file:${dbName}`
-            : `postgres://${TEST_PG_CONFIG.user}:${TEST_PG_CONFIG.password}@${TEST_PG_CONFIG.host}:${TEST_PG_CONFIG.port}/${dbName}`;
+    const testPg = `postgres://${TEST_PG_CONFIG.user}:${TEST_PG_CONFIG.password}@${TEST_PG_CONFIG.host}:${TEST_PG_CONFIG.port}`;
+    const dbUrl = provider === 'sqlite' ? `file:${dbName}` : `${testPg}/${dbName}`;
 
+    if (provider === 'postgresql') {
+        const pg = new PostgresClient({
+            connectionString: `${testPg}/postgres`,
+        });
+        await pg.connect();
+        await pg.query(`CREATE DATABASE ${dbName};`);
+        await pg.end();
+    }
     const ZMODEL_PRELUDE = `datasource db {
     provider = "${provider}"
     url      = "${dbUrl}"
 }
 `;
-    const workDir = createTestProject();
-    fs.mkdirSync(path.join(workDir, 'zenstack'), { recursive: true });
-    const schemaPath = path.join(workDir, 'zenstack/schema.zmodel');
-    fs.writeFileSync(schemaPath, addPrelude ? `${ZMODEL_PRELUDE}\n${zmodel}` : zmodel);
-    return workDir;
+
+    return createProject(addPrelude ? `${ZMODEL_PRELUDE}\n${zmodel}` : zmodel, false);
 }
 
 export function runCli(command: string, cwd: string) {