@dbos-inc/create 3.0.45-preview.g34e483ff45 → 3.0.50-preview

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dbos-inc/create",
-  "version": "3.0.45-preview.g34e483ff45",
+  "version": "3.0.50-preview",
   "description": "Tool for performing project initialization from template",
   "license": "MIT",
   "type": "module",

package/templates/dbos-drizzle/dbos-config.yaml

@@ -5,7 +5,6 @@
 
 name: dbos-drizzle
 language: node
-database_url: ${DBOS_DATABASE_URL}
 database:
   migrate:
     - npx drizzle-kit migrate

package/templates/dbos-drizzle/src/main.test.ts

@@ -1,6 +1,7 @@
 import { DBOS } from '@dbos-inc/dbos-sdk';
-import { app, Hello } from './main';
+import { app, config, Hello } from './main';
 import request from 'supertest';
+import { Client } from 'pg';
 
 describe('operations-test', () => {
   beforeAll(async () => {
@@ -18,9 +19,14 @@ describe('operations-test', () => {
     const res = await Hello.helloTransaction('dbos');
     expect(res).toMatch('Hello, dbos! We have made');
 
-    // Check the greet count.
-    const rows = await DBOS.queryUserDB('SELECT * FROM dbos_hello WHERE greet_count=1');
-    expect(rows.length).toEqual(1);
+    const client = new Client(config);
+    try {
+      await client.connect();
+      const rows = await client.query('SELECT * FROM dbos_hello WHERE greet_count=1');
+      expect(rows.rows.length).toEqual(1);
+    } finally {
+      await client.end();
+    }
   });
 
   /**

package/templates/dbos-drizzle/src/main.ts

@@ -10,12 +10,10 @@ import { dbosHello } from './schema';
 import { DrizzleDataSource } from '@dbos-inc/drizzle-datasource';
 import { NodePgDatabase } from 'drizzle-orm/node-postgres';
 
-const config = {
-  host: process.env.PGHOST || 'localhost',
-  port: parseInt(process.env.PGPORT || '5432'),
-  database: process.env.PGDATABASE || 'dbos_drizzle',
-  user: process.env.PGUSER || 'postgres',
-  password: process.env.PGPASSWORD || 'dbos',
+export const config = {
+  connectionString:
+    process.env.DBOS_DATABASE_URL ||
+    `postgresql://${process.env.PGUSER || 'postgres'}:${process.env.PGPASSWORD || 'dbos'}@${process.env.PGHOST || 'localhost'}:${process.env.PGPORT || '5432'}/${process.env.PGDATABASE || 'dbos_drizzle'}`,
 };
 
 const drizzleds = new DrizzleDataSource<NodePgDatabase>('app-db', config);
@@ -95,7 +93,7 @@ async function main() {
     name: 'dbos-drizzle',
     databaseUrl: process.env.DBOS_DATABASE_URL,
   });
-  await DBOS.launch({ expressApp: app });
+  await DBOS.launch();
   const PORT = parseInt(process.env.NODE_PORT || '3000');
   const ENV = process.env.NODE_ENV || 'development';
 

package/templates/dbos-knex/dbos-config.yaml

@@ -5,7 +5,6 @@
 
 name: dbos-knex
 language: node
-database_url: ${DBOS_DATABASE_URL}
 database:
   migrate:
     - npx knex migrate:latest

package/templates/dbos-knex/src/main.test.ts

@@ -4,7 +4,7 @@ import request from 'supertest';
 
 describe('operations-test', () => {
   beforeAll(async () => {
-    await DBOS.launch({ expressApp: app });
+    await DBOS.launch();
   });
 
   afterAll(async () => {

package/templates/dbos-knex/src/main.ts

@@ -9,13 +9,9 @@ import { KnexDataSource } from '@dbos-inc/knex-datasource';
 
 const config = {
   client: 'pg',
-  connection: {
-    host: process.env.PGHOST || 'localhost',
-    port: parseInt(process.env.PGPORT || '5432'),
-    database: process.env.PGDATABASE || 'dbos_knex',
-    user: process.env.PGUSER || 'postgres',
-    password: process.env.PGPASSWORD || 'dbos',
-  },
+  connection:
+    process.env.DBOS_DATABASE_URL ||
+    `postgresql://${process.env.PGUSER || 'postgres'}:${process.env.PGPASSWORD || 'dbos'}@${process.env.PGHOST || 'localhost'}:${process.env.PGPORT || '5432'}/${process.env.PGDATABASE || 'dbos_knex'}`,
 };
 
 const knexds = new KnexDataSource('app-db', config);
@@ -110,7 +106,7 @@ async function main() {
     name: 'dbos-knex',
     databaseUrl: process.env.DBOS_DATABASE_URL,
   });
-  await DBOS.launch({ expressApp: app });
+  await DBOS.launch();
   const PORT = parseInt(process.env.NODE_PORT || '3000');
   const ENV = process.env.NODE_ENV || 'development';
 

package/templates/dbos-prisma/dbos-config.yaml

@@ -5,7 +5,6 @@
 
 name: dbos-prisma
 language: node
-database_url: ${DBOS_DATABASE_URL}
 database:
   migrate:
     - npx prisma migrate deploy

package/templates/dbos-prisma/src/main.ts

@@ -10,6 +10,7 @@ import { PrismaClient } from '@prisma/client';
 import { PrismaDataSource } from '@dbos-inc/prisma-datasource';
 
 process.env['DATABASE_URL'] =
+  process.env['DBOS_DATABASE_URL'] ||
   process.env['DATABASE_URL'] ||
   `postgresql://${process.env.PGUSER || 'postgres'}:${process.env.PGPASSWORD || 'dbos'}@${process.env.PGHOST || 'localhost'}:${process.env.PGPORT || '5432'}/${process.env.PGDATABASE || 'dbos_prisma'}`;
 
@@ -93,7 +94,7 @@ async function main() {
     name: 'dbos-prisma',
     databaseUrl: process.env.DBOS_DATABASE_URL,
   });
-  await DBOS.launch({ expressApp: app });
+  await DBOS.launch();
   const PORT = parseInt(process.env.NODE_PORT || '3000');
   const ENV = process.env.NODE_ENV || 'development';
 

package/templates/dbos-typeorm/dbos-config.yaml

@@ -5,7 +5,6 @@
 
 name: dbos-typeorm
 language: node
-database_url: ${DBOS_DATABASE_URL}
 database:
   migrate:
     - npx typeorm migration:run -d dist/datasource.js

package/templates/dbos-typeorm/src/main.ts

@@ -10,11 +10,9 @@ import { DBOSHello } from '../entities/DBOSHello';
 import { TypeOrmDataSource } from '@dbos-inc/typeorm-datasource';
 
 const config = {
-  host: process.env.PGHOST || 'localhost',
-  port: parseInt(process.env.PGPORT || '5432'),
-  database: process.env.PGDATABASE || 'dbos_typeorm',
-  user: process.env.PGUSER || 'postgres',
-  password: process.env.PGPASSWORD || 'dbos',
+  connectionString:
+    process.env.DBOS_DATABASE_URL ||
+    `postgresql://${process.env.PGUSER || 'postgres'}:${process.env.PGPASSWORD || 'dbos'}@${process.env.PGHOST || 'localhost'}:${process.env.PGPORT || '5432'}/${process.env.PGDATABASE || 'dbos_typeorm'}`,
 };
 
 const dataSource = new TypeOrmDataSource('app-db', config, [DBOSHello]);
@@ -93,7 +91,7 @@ async function main() {
     name: 'dbos-typeorm',
     databaseUrl: process.env.DBOS_DATABASE_URL,
   });
-  await DBOS.launch({ expressApp: app });
+  await DBOS.launch();
   const PORT = parseInt(process.env.NODE_PORT || '3000');
   const ENV = process.env.NODE_ENV || 'development';