@tylix/orm 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tylix/orm",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/adapters/MongoAdapter.js

@@ -85,6 +85,10 @@ export class MongoAdapter extends DatabaseAdapter {
     }
   }
 
+  quoteIdentifier(name) {
+    return name
+  }
+
   ensureConnected() {
     if (!this.db) {
       throw new Error('MongoAdapter is not connected. Call connect() first.')

package/src/adapters/MysqlAdapter.js

@@ -41,6 +41,10 @@ export class MysqlAdapter extends DatabaseAdapter {
     }
   }
 
+  quoteIdentifier(name) {
+    return `\`${name.replace(/`/g, '``')}\``
+  }
+
   ensureConnected() {
     if (!this.connection) {
       throw new Error('MysqlAdapter is not connected. Call connect() first.')

package/src/adapters/PostgresAdapter.js

@@ -40,7 +40,6 @@ export class PostgresAdapter extends DatabaseAdapter {
     this.pool = new pg.Pool(this.config)
     return this
   }
-
   async close() {
     if (this.pool) {
       await this.pool.end()
@@ -48,6 +47,10 @@ export class PostgresAdapter extends DatabaseAdapter {
     }
   }
 
+  quoteIdentifier(name) {
+    return `"${name.replace(/"/g, '""')}"`
+  }
+
   ensureConnected() {
     if (!this.pool) {
       throw new Error('PostgresAdapter is not connected. Call connect() first.')

package/src/adapters/SqliteAdapter.js

@@ -32,6 +32,10 @@ export class SqliteAdapter extends DatabaseAdapter {
     }
   }
 
+  quoteIdentifier(name) {
+    return `"${name.replace(/"/g, '""')}"`
+  }
+
   ensureConnected() {
     if (!this.db) {
       throw new Error('SqliteAdapter is not connected. Call connect() first.')

package/src/ensureDatabaseExists.js

@@ -0,0 +1,64 @@
+import pg from 'pg'
+import mysql from 'mysql2/promise'
+
+export async function ensureDatabaseExists(databaseConfig) {
+  const { driver } = databaseConfig
+  if (driver === 'postgres') {
+    await ensurePostgresDatabase(databaseConfig)
+  } else if (driver === 'mysql') {
+    await ensureMysqlDatabase(databaseConfig)
+  }
+  // sqlite: the file is created automatically on connect, nothing to do here.
+  // mongodb: databases/collections are created lazily on first write, nothing to do here.
+}
+
+async function ensurePostgresDatabase({
+  connectionString,
+  host,
+  port,
+  user,
+  password,
+  database,
+}) {
+  // A connection string can already point at a specific target db and
+  // may not even include a "postgres" admin database to fall back to --
+  // safest to skip auto-create rather than guess at rewriting it.
+  if (connectionString) return
+
+  const adminPool = new pg.Pool({
+    host,
+    port,
+    user,
+    password,
+    database: 'postgres',
+  })
+  try {
+    const { rows } = await adminPool.query(
+      'SELECT 1 FROM pg_database WHERE datname = $1',
+      [database],
+    )
+    if (rows.length === 0) {
+      // Postgres doesn't support "CREATE DATABASE IF NOT EXISTS", and
+      // database names can't be parameterized -- quote defensively.
+      await adminPool.query(`CREATE DATABASE "${database.replace(/"/g, '""')}"`)
+    }
+  } finally {
+    await adminPool.end()
+  }
+}
+
+async function ensureMysqlDatabase({ host, port, user, password, database }) {
+  const connection = await mysql.createConnection({
+    host,
+    port,
+    user,
+    password,
+  })
+  try {
+    await connection.query(
+      `CREATE DATABASE IF NOT EXISTS \`${database.replace(/`/g, '``')}\``,
+    )
+  } finally {
+    await connection.end()
+  }
+}

package/src/index.js

@@ -8,3 +8,4 @@ export * from './adapters/MysqlAdapter.js'
 export * from './adapters/MongoAdapter.js'
 export * from './query/QueryBuilder.js'
 export * from './query/buildSelectSql.js'
+export * from './ensureDatabaseExists.js'