feat(postgres): sim support

postgres/README.md

@@ -50,7 +50,8 @@ When you deploy Terraform that uses the `Database` class, you will need to have
 - [x] Support `tf-aws` platform using Neon
 - [ ] Support `sim` platform
 - [ ] Make all Neon databases share a Neon project to stay within the free tier
-- [ ] Initialize secret value only `cloud.Secret` APIs
+- [ ] Reuse postgres client across multiple queries by requiring users to call `connect()` / `end()` methods
+- [ ] Initialize secret value through `cloud.Secret` APIs - https://github.com/winglang/wing/issues/2726
 - [ ] Support [parameterized queries](https://node-postgres.com/features/queries#parameterized-query) for preventing SQL injection
 - [ ] Customize [type parser](https://node-postgres.com/features/queries#types) for most popular postgres types / conversions to Wing types
 - [ ] Have `query()` return both rows and a list of field names

postgres/lib.test.w

@@ -2,11 +2,10 @@ bring expect;
 bring util;
 bring "./lib.w" as l;
 
-if util.env("WING_TARGET") == "tf-aws" {
-  let db = new l.Database(name: "test", pgVersion: 15);
+let db = new l.Database(name: "test", pgVersion: 15);
 
-  test "run a simple query" {
-    let result = db.query("SELECT 1 as one, 2 as two;");
-    expect.equal(result.at(0), {one: 1, two: 2});
-  }
+test "run a simple query" {
+  util.sleep(1s);
+  let result = db.query("SELECT 1 as one, 2 as two;");
+  expect.equal(result.at(0), {one: 1, two: 2});
 }

postgres/lib.w

@@ -1,18 +1,13 @@
 bring aws;
 bring cloud;
+bring containers;
+bring http;
 bring util;
 bring "constructs" as constructs;
 bring "cdktf" as cdktf;
 bring "@rybickic/cdktf-provider-neon" as rawNeon;
 bring "@cdktf/provider-aws" as tfaws;
 
-struct Credentials {
-  host: str;
-  user: str;
-  password: str;
-  dbname: str;
-}
-
 pub struct DatabaseProps {
   /**
    * The database name.
@@ -22,7 +17,7 @@ pub struct DatabaseProps {
    * The postgres version.
    * @default 15
    */
-  pgVersion: num;
+  pgVersion: num?;
 }
 
 pub interface IDatabase {
@@ -31,9 +26,11 @@ pub interface IDatabase {
 
 pub class Database {
   inner: IDatabase;
-  init(props: DatabaseProps) {
+  new(props: DatabaseProps) {
     let target = util.env("WING_TARGET");
-    if target == "tf-aws" {
+    if target == "sim" {
+      this.inner = new DatabaseSim(props);
+    } elif target == "tf-aws" {
       this.inner = new DatabaseNeon(props);
     } else {
       throw "Unsupported target: " + target;
@@ -45,16 +42,52 @@ pub class Database {
   }
 }
 
-pub class DatabaseNeon impl IDatabase {
+class DatabaseSim impl IDatabase {
+  url: str?;
+  new(props: DatabaseProps) {
+    let image = "postgres:${props.pgVersion ?? 15}";
+    let container = new containers.Workload(
+      name: "postgres",
+      image: image,
+      env: {
+        POSTGRES_PASSWORD: "password"
+      },
+      port: 5432,
+      public: true,
+    );
+    this.url = container.getPublicUrl();
+  }
+
+  pub inflight query(query: str): Array<Map<Json>> {
+    let port = num.fromStr(http.parseUrl(this.url ?? "error").port);
+    return PgUtil._query(query, {
+      host: "localhost",
+      password: "password",
+      database: "postgres",
+      user: "postgres",
+      port: port,
+      ssl: false,
+    });
+  }
+}
+
+struct DbCredentials {
+  host: str;
+  user: str;
+  password: str;
+  database: str;
+}
+
+class DatabaseNeon impl IDatabase {
   creds: cloud.Secret;
 
-  init(props: DatabaseProps) {
+  new(props: DatabaseProps) {
     this.neonProvider();
 
     // TODO: share a project between multiple databases
     let project = new rawNeon.project.Project(
       name: props.name,
-      pgVersion: props.pgVersion,
+      pgVersion: props.pgVersion ?? 15,
     );
 
     let db = new rawNeon.database.Database(
@@ -74,7 +107,7 @@ pub class DatabaseNeon impl IDatabase {
         host: project.databaseHost,
         user: project.databaseUser,
         password: project.databasePassword,
-        dbname: project.databaseName,
+        database: project.databaseName,
       })
     ) as "NeonCredentialsVersion";
   }
@@ -90,10 +123,27 @@ pub class DatabaseNeon impl IDatabase {
     return new rawNeon.provider.NeonProvider() as singletonKey in stack;
   }
 
-  extern "./pg.js" static inflight _query(query: str, creds: Credentials): Array<Map<Json>>;
-
   pub inflight query(query: str): Array<Map<Json>> {
-    let creds = Credentials.fromJson(this.creds.valueJson());
-    return DatabaseNeon._query(query, creds);
+    let creds = DbCredentials.fromJson(this.creds.valueJson());
+    return PgUtil._query(query, {
+      host: creds.host,
+      user: creds.user,
+      password: creds.password,
+      database: creds.database,
+      ssl: true,
+    });
   }
 }
+
+struct ConnectionOptions {
+  host: str;
+  port: num?; // default: 5432
+  user: str;
+  password: str;
+  database: str;
+  ssl: bool;
+}
+
+class PgUtil {
+  pub extern "./pg.js" static inflight _query(query: str, creds: ConnectionOptions): Array<Map<Json>>;
+}