@relq/orm 0.1.3 → 0.1.4

package/dist/esm/utils/env-resolver.js

@@ -73,7 +73,14 @@ function getEnv(key) {
         return undefined;
     }
     ensureEnvLoaded();
-    return process.env[key];
+    if (process.env[key] !== undefined)
+        return process.env[key];
+    const keyLower = key.toLowerCase();
+    for (const k in process.env) {
+        if (k.toLowerCase() === keyLower)
+            return process.env[k];
+    }
+    return undefined;
 }
 function getEnvNumber(key) {
     const val = getEnv(key);
@@ -82,17 +89,17 @@ function getEnvNumber(key) {
     const num = parseInt(val, 10);
     return isNaN(num) ? undefined : num;
 }
-function getEnvBoolean(key) {
-    const val = getEnv(key);
-    if (val === undefined)
-        return undefined;
-    return val === 'true' || val === '1';
-}
 export function resolvePgEnv() {
     const result = {};
-    const databaseUrl = getEnv('DATABASE_URL');
+    const databaseUrl = getEnv('DATABASE_URL') ??
+        getEnv('POSTGRES_URL') ??
+        getEnv('POSTGRES_PRISMA_URL') ??
+        getEnv('NEON_DATABASE_URL') ??
+        getEnv('SUPABASE_DB_URL') ??
+        getEnv('COCKROACH_DATABASE_URL') ??
+        getEnv('PG_CONNECTION_STRING');
     if (databaseUrl) {
-        result.connectionString = databaseUrl;
+        result.url = databaseUrl;
     }
     result.host = getEnv('DATABASE_HOST') ?? getEnv('PGHOST');
     result.port = getEnvNumber('DATABASE_PORT') ?? getEnvNumber('PGPORT');
@@ -114,16 +121,49 @@ export function resolveAwsEnv() {
         database: getEnv('AWS_DATABASE_NAME') ?? 'postgres'
     };
 }
+export function resolveMysqlEnv() {
+    const result = {};
+    const databaseUrl = getEnv('DATABASE_URL') ??
+        getEnv('MYSQL_URL') ??
+        getEnv('MYSQL_DATABASE_URL') ??
+        getEnv('PLANETSCALE_DATABASE_URL') ??
+        getEnv('MARIADB_URL');
+    if (databaseUrl) {
+        result.url = databaseUrl;
+    }
+    result.host = getEnv('MYSQL_HOST') ?? getEnv('DATABASE_HOST');
+    result.port = getEnvNumber('MYSQL_PORT') ?? getEnvNumber('DATABASE_PORT') ?? undefined;
+    result.user = getEnv('MYSQL_USER') ?? getEnv('DATABASE_USER');
+    result.password = getEnv('MYSQL_PASSWORD') ?? getEnv('DATABASE_PASSWORD');
+    result.database = getEnv('MYSQL_DATABASE') ?? getEnv('DATABASE_NAME');
+    const sslMode = getEnv('MYSQL_SSL') ?? getEnv('DATABASE_SSL');
+    if (sslMode) {
+        result.ssl = sslMode !== 'disable' && sslMode !== 'false' && sslMode !== '0';
+    }
+    return result;
+}
 export function hasPgEnvConfig(env) {
-    if (env.connectionString)
+    if (env.url)
         return true;
     return !!(env.host || env.database);
 }
 export function hasAwsEnvConfig(env) {
     return !!(env.hostname && env.region);
 }
+export function hasMysqlEnvConfig(env) {
+    if (env.url)
+        return true;
+    return !!(env.host || env.database);
+}
 function hasUserPgConfig(config) {
-    if (config.connectionString)
+    if (config.url)
+        return true;
+    if (config.host || config.database)
+        return true;
+    return false;
+}
+function hasUserMysqlConfig(config) {
+    if (config.url)
         return true;
     if (config.host || config.database)
         return true;
@@ -139,7 +179,14 @@ export function validateEnvConfig(dialect, config = {}) {
     switch (dialect) {
         case 'postgres':
         case 'nile':
-        case 'cockroachdb': {
+        case 'cockroachdb':
+        case 'supabase':
+        case 'neon':
+        case 'alloydb':
+        case 'aurora':
+        case 'yugabytedb':
+        case 'citus':
+        case 'timescale': {
             if (hasUserPgConfig(config))
                 return;
             const env = resolvePgEnv();
@@ -170,6 +217,20 @@ export function validateEnvConfig(dialect, config = {}) {
                 `  AWS_SECRET_ACCESS_KEY=...\n\n` +
                 `Missing: ${missing.join(', ')}`, { field: 'config' });
         }
+        case 'mysql':
+        case 'mariadb':
+        case 'planetscale': {
+            if (hasUserMysqlConfig(config))
+                return;
+            const env = resolveMysqlEnv();
+            if (hasMysqlEnvConfig(env))
+                return;
+            throw new RelqConfigError(`Missing database configuration for "${dialect}".\n\n` +
+                `Provide connection options or set environment variables:\n` +
+                `  DATABASE_URL=mysql://user:pass@host:3306/dbname\n` +
+                `  or: MYSQL_URL, PLANETSCALE_DATABASE_URL, MARIADB_URL\n` +
+                `  or: MYSQL_HOST, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE`, { field: 'config' });
+        }
         default:
             break;
     }
@@ -179,7 +240,7 @@ export function mergeWithPgEnv(config) {
     return {
         ...env,
         ...config,
-        connectionString: config.connectionString ?? env.connectionString
+        url: config.url ?? env.url
     };
 }
 export function mergeWithAwsEnv(config) {

package/dist/esm/utils/index.js

@@ -1,4 +1,4 @@
 export { convertCase } from "./case-converter.js";
 export { default as format } from "../shared/pg-format.js";
-export { resolveForeignKey, resolveForeignKeyOrThrow, getAvailableRelations, getAllForeignKeys, ForeignKeyResolutionError } from "./fk-resolver.js";
+export { resolveForeignKey, resolveForeignKeyOrThrow, getAvailableRelations, getAllForeignKeys, ForeignKeyResolutionError } from "../pg/utils/fk-resolver.js";
 export { loadEnvFile, resolvePgEnv, resolveAwsEnv, hasPgEnvConfig, hasAwsEnvConfig, validateEnvConfig, mergeWithPgEnv, mergeWithAwsEnv } from "./env-resolver.js";