Add support for overriding pg schema

.github/workflows/build_and_test.yml

@@ -27,6 +27,7 @@ jobs:
           POSTGRES_PASSWORD: testing
           POSTGRES_DB: envio-dev
           POSTGRES_USER: postgres
+          POSTGRES_SCHEMA: public
         # Set health checks to wait until postgres has started
         options: >-
           --health-cmd pg_isready

codegenerator/cli/npm/envio/src/bindings/Postgres.res

@@ -69,6 +69,7 @@ type poolConfig = {
   database?: string, // Name of database to connect to (default: '')
   username?: string, // Username of database user (default: '')
   password?: string, // Password of database user (default: '')
+  schema?: string, // Name of schema to connect to (default: 'public')
   ssl?: sslOptions, // true, prefer, require, tls.connect options (default: false)
   max?: int, // Max number of connections (default: 10)
   maxLifetime?: option<int>, // Max lifetime in seconds (more info below) (default: null)

codegenerator/cli/src/persisted_state/db.rs

@@ -12,8 +12,9 @@ async fn get_pg_pool() -> Result<PgPool, sqlx::Error> {
     let user = get_env_with_default("ENVIO_PG_USER", "postgres");
     let password = get_env_with_default("ENVIO_POSTGRES_PASSWORD", "testing");
     let database = get_env_with_default("ENVIO_PG_DATABASE", "envio-dev");
+    let schema = get_env_with_default("ENVIO_PG_SCHEMA", "public");
 
-    let connection_url = format!("postgres://{user}:{password}@{host}:{port}/{database}");
+    let connection_url = format!("postgres://{user}:{password}@{host}:{port}/{database}?currentSchema={schema}");
 
     PgPoolOptions::new().connect(&connection_url).await
 }
@@ -27,7 +28,7 @@ impl PersistedState {
     async fn upsert_to_db_with_pool(&self, pool: &PgPool) -> Result<PgQueryResult, sqlx::Error> {
         sqlx::query(
             r#"
-            INSERT INTO public.persisted_state (
+            INSERT INTO persisted_state (
                 id, 
                 envio_version,
                 config_hash,

codegenerator/cli/templates/static/codegen/docker-compose.yaml

@@ -10,6 +10,7 @@ services:
       POSTGRES_PASSWORD: ${ENVIO_POSTGRES_PASSWORD:-testing}
       POSTGRES_USER: ${ENVIO_PG_USER:-postgres}
       POSTGRES_DB: ${ENVIO_PG_DATABASE:-envio-dev}
+      POSTGRES_SCHEMA: ${ENVIO_PG_SCHEMA:-public}
     networks:
       - my-proxy-net
   graphql-engine:

codegenerator/cli/templates/static/codegen/src/Env.res

@@ -112,6 +112,7 @@ module Db = {
   let user = envSafe->EnvSafe.get("ENVIO_PG_USER", S.string, ~devFallback="postgres")
   let password = envSafe->EnvSafe.get("ENVIO_POSTGRES_PASSWORD", S.string, ~devFallback="testing")
   let database = envSafe->EnvSafe.get("ENVIO_PG_DATABASE", S.string, ~devFallback="envio-dev")
+  let schema = envSafe->EnvSafe.get("ENVIO_PG_SCHEMA", S.string, ~devFallback="public")
   let ssl = envSafe->EnvSafe.get(
     "ENVIO_PG_SSL_MODE",
     Postgres.sslOptionsSchema,

codegenerator/cli/templates/static/codegen/src/db/Db.res

@@ -7,6 +7,7 @@ let config: Postgres.poolConfig = {
   username: Env.Db.user,
   password: Env.Db.password,
   database: Env.Db.database,
+  schema: Env.Db.schema,
   ssl: Env.Db.ssl,
   // TODO: think how we want to pipe these logs to pino.
   onnotice: ?(Env.userLogLevel == #warn || Env.userLogLevel == #error ? None : Some(_str => ())),