@strapi/database 5.1.0 → 5.2.0

package/dist/index.mjs

@@ -23,7 +23,8 @@ class Dialect {
     this.db = db;
     this.client = client;
   }
-  configure() {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  configure(conn) {
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async initialize(_nativeConnection) {
@@ -888,8 +889,8 @@ class SqliteDialect extends Dialect {
     super(db, "sqlite");
     this.schemaInspector = new SqliteSchemaInspector(db);
   }
-  configure() {
-    const connection = this.db.config.connection.connection;
+  configure(conn) {
+    const connection = conn || this.db.config.connection.connection;
     if (typeof connection !== "string") {
       connection.filename = path.resolve(connection.filename);
     }
@@ -4190,7 +4191,7 @@ const applyWhere = (qb, where) => {
   });
 };
 const fieldLowerFn = (qb) => {
-  if (qb.client.config.client === "postgres") {
+  if (qb.client.dialect === "postgresql") {
     return "LOWER(CAST(?? AS VARCHAR))";
   }
   return "LOWER(??)";
@@ -6759,19 +6760,42 @@ class Database {
         ...config.settings ?? {}
       }
     };
+    this.logger = config.logger ?? console;
     this.dialect = getDialect(this);
-    this.dialect.configure();
+    let knexConfig = this.config.connection;
+    if (typeof this.config.connection.connection !== "function") {
+      this.dialect.configure();
+    } else {
+      this.logger.warn(
+        "Knex connection functions are currently experimental. Attempting to access the connection object before database initialization will result in errors."
+      );
+      knexConfig = {
+        ...this.config.connection,
+        connection: async () => {
+          const conn = await this.config.connection.connection();
+          this.dialect.configure(conn);
+          return conn;
+        }
+      };
+    }
     this.metadata = createMetadata([]);
-    this.connection = createConnection(this.config.connection, {
+    this.connection = createConnection(knexConfig, {
       pool: { afterCreate: afterCreate(this) }
     });
     this.schema = createSchemaProvider(this);
     this.migrations = createMigrationsProvider(this);
     this.lifecycles = createLifecyclesProvider(this);
     this.entityManager = createEntityManager(this);
-    this.logger = config.logger ?? console;
   }
   async init({ models }) {
+    if (typeof this.config.connection.connection === "function") {
+      this.logger.debug("Forcing Knex to make real connection to db");
+      if (this.config.connection.client === "sqlite") {
+        await this.connection.raw("SELECT 1");
+      } else {
+        await this.connection.client.acquireConnection();
+      }
+    }
     this.metadata.loadModels(models);
     await validateDatabase(this);
     return this;