@objectstack/driver-sql 9.3.0 → 9.4.0

package/dist/index.js

@@ -285,33 +285,47 @@ var SqlDriver = class {
   // CRUD — DriverInterface core
   // ===================================
   async find(object, query, options) {
-    const builder = this.getBuilder(object, options);
-    this.applyTenantScope(builder, object, options);
+    const buildBase = () => {
+      const b = this.getBuilder(object, options);
+      this.applyTenantScope(b, object, options);
+      if (query.where) {
+        this.applyFilters(b, query.where);
+      }
+      if (query.orderBy && Array.isArray(query.orderBy)) {
+        for (const item of query.orderBy) {
+          if (item.field) {
+            b.orderBy(this.mapSortField(item.field), item.order || "asc");
+          }
+        }
+      }
+      if (query.offset !== void 0) b.offset(query.offset);
+      if (query.limit !== void 0) b.limit(query.limit);
+      return b;
+    };
+    const builder = buildBase();
     if (query.fields) {
       builder.select(query.fields.map((f) => this.mapSortField(f)));
     } else {
       builder.select("*");
     }
-    if (query.where) {
-      this.applyFilters(builder, query.where);
-    }
-    if (query.orderBy && Array.isArray(query.orderBy)) {
-      for (const item of query.orderBy) {
-        if (item.field) {
-          builder.orderBy(this.mapSortField(item.field), item.order || "asc");
-        }
-      }
-    }
-    if (query.offset !== void 0) builder.offset(query.offset);
-    if (query.limit !== void 0) builder.limit(query.limit);
     let results;
     try {
       results = await builder;
     } catch (error) {
-      if (error.message && (error.message.includes("no such column") || error.message.includes("column") && error.message.includes("does not exist"))) {
-        return [];
+      const isUnknownColumn = error.message && (error.message.includes("no such column") || error.message.includes("column") && error.message.includes("does not exist"));
+      if (isUnknownColumn) {
+        if (query.fields) {
+          try {
+            results = await buildBase().select("*");
+          } catch {
+            return [];
+          }
+        } else {
+          return [];
+        }
+      } else {
+        throw error;
       }
-      throw error;
     }
     if (!Array.isArray(results)) {
       return [];