@c9up/atlas 0.3.10 → 0.3.12

package/dist/ModelQuery.js

@@ -619,8 +619,10 @@ export class ModelQuery {
         // `col as alias` — resolve the (bare) column part to its DB name, keep the
         // alias verbatim, so `select('label as name')` honours a columnName override.
         const aliased = col.match(/^([A-Za-z_][A-Za-z0-9_]*)\s+as\s+([A-Za-z_][A-Za-z0-9_]*)$/i);
-        if (aliased)
-            return `${this.#resolveColumn(aliased[1])} AS ${aliased[2]}`;
+        const [, aliasSource, aliasName] = aliased ?? [];
+        if (aliasSource !== undefined && aliasName !== undefined) {
+            return `${this.#resolveColumn(aliasSource)} AS ${aliasName}`;
+        }
         return col;
     }
     where(columnOrCb, operatorOrValue, value) {
@@ -2003,7 +2005,11 @@ export class ModelQuery {
         if (rows.length > 1) {
             throw new Error(`Expected exactly one ${this.#tableName} but the query matched multiple rows (sole()).`);
         }
-        return rows[0];
+        const [only] = rows;
+        if (only === undefined) {
+            throw new Error(`Expected exactly one ${this.#tableName} but the query matched none (sole()).`);
+        }
+        return only;
     }
     /**
      * Thenable — `await someQuery` is equivalent to `await someQuery.exec()`.
@@ -2155,7 +2161,7 @@ export class ModelQuery {
      */
     #compiledNative() {
         const compiled = compileStatementNative(this.#buildSpec(), this.#dialect);
-        const sql = this.#commentPrefix() + compiled.statements[0];
+        const sql = this.#commentPrefix() + onlyStatement(compiled);
         return { sql, params: compiled.params };
     }
     /**
@@ -2806,7 +2812,7 @@ export class ModelQuery {
             lockMode: null,
         };
         const compiled = compileStatementNative(spec, this.#dialect);
-        return this.#db.query(compiled.statements[0], compiled.params);
+        return this.#db.query(onlyStatement(compiled), compiled.params);
     }
     /**
      * Run a relation preload against the related table, applying the relation's
@@ -3287,13 +3293,14 @@ export class ModelQuery {
             }
             // Build the disjunctive tuple comparison as a nested group of WHEREs.
             clone.where((q) => {
-                for (let i = 0; i < cols.length; i++) {
+                for (const [i, col] of cols.entries()) {
                     q.orWhere((inner) => {
-                        for (let j = 0; j < i; j++)
-                            inner.where(cols[j], decoded.v[j]);
+                        for (const [j, earlier] of cols.slice(0, i).entries()) {
+                            inner.where(earlier, decoded.v[j]);
+                        }
                         // The comparison has to follow the walk: `>` reads forward
                         // through an ascending order, `<` through a descending one.
-                        inner.where(cols[i], descending ? "<" : ">", decoded.v[i]);
+                        inner.where(col, descending ? "<" : ">", decoded.v[i]);
                     });
                 }
             });
@@ -3771,7 +3778,7 @@ export class ModelQuery {
             ctes: this.#compiledCtes(),
         };
         const compiled = compileStatementNative(spec, this.#dialect);
-        const r = await this.#raceTimeout(this.#db.execute(this.#commentPrefix() + compiled.statements[0], compiled.params, this.#meta("dml")));
+        const r = await this.#raceTimeout(this.#db.execute(this.#commentPrefix() + onlyStatement(compiled), compiled.params, this.#meta("dml")));
         return r.rowsAffected ?? 0;
     }
     /**
@@ -3815,7 +3822,7 @@ export class ModelQuery {
     /** Compile a DML spec with the comment prefix — for a lazy builder's `.toSQL()`. */
     #compileDmlSpec(spec) {
         const compiled = compileStatementNative(spec, this.#dialect);
-        const sql = this.#commentPrefix() + compiled.statements[0];
+        const sql = this.#commentPrefix() + onlyStatement(compiled);
         return { sql, bindings: compiled.params, params: compiled.params };
     }
     /** Hooks a lazy DML builder delegates back to (upsert clauses are N/A on a model query). */
@@ -3858,9 +3865,9 @@ export class ModelQuery {
     async #runDml(spec, returning) {
         const compiled = compileStatementNative(spec, this.#dialect);
         if (returning && returning.length > 0) {
-            return this.#raceTimeout(this.#db.query(this.#commentPrefix() + compiled.statements[0], compiled.params, this.#meta("dml")));
+            return this.#raceTimeout(this.#db.query(this.#commentPrefix() + onlyStatement(compiled), compiled.params, this.#meta("dml")));
         }
-        const r = await this.#raceTimeout(this.#db.execute(this.#commentPrefix() + compiled.statements[0], compiled.params, this.#meta("dml")));
+        const r = await this.#raceTimeout(this.#db.execute(this.#commentPrefix() + onlyStatement(compiled), compiled.params, this.#meta("dml")));
         return r.rowsAffected ?? 0;
     }
     /**
@@ -3966,4 +3973,18 @@ export class ModelQuery {
 _a = ModelQuery;
 /** `col as alias` — the Lucid aggregate spelling. */
 const ALIASED = /^(.*?)\s+as\s+(\S+)$/i;
+/**
+ * The single statement a compile produced.
+ *
+ * `compileStatementNative` answers a list because a few specs expand to more
+ * than one; the callers here compile specs that do not, and this is where that
+ * is stated instead of reading index zero as a value that might not be there.
+ */
+function onlyStatement(compiled) {
+    const [statement] = compiled.statements;
+    if (statement === undefined) {
+        throw new Error("atlas: the query compiler produced no statement");
+    }
+    return statement;
+}
 //# sourceMappingURL=ModelQuery.js.map