xcraft-core-pickaxe 0.1.29 → 0.1.30

package/lib/operator-to-sql.js

@@ -3,6 +3,7 @@
 const {isAnyPick, BasePick} = require('./picks.js');
 
 /**
+ * @typedef {import("./query-builder.js").DbTable} DbTable
  * @typedef {import("./operators.js").Expression} Expression
  */
 
@@ -103,6 +104,14 @@ const operators = {
     return `LENGTH(${sql(value, context)})`;
   },
 
+  lower({value}, context) {
+    return `LOWER(${sql(value, context)})`;
+  },
+
+  upper({value}, context) {
+    return `UPPER(${sql(value, context)})`;
+  },
+
   substr({value, start, length}, context) {
     const valueSql = sql(value, context);
     const startSql = sql(start, context);
@@ -343,6 +352,7 @@ function getExpression(expressionOrPick) {
 /**
  * @typedef {{
  *   values: any[] | null,
+ *   tablesUsed: DbTable[],
  *   scope?: any,
  *   useTableNames?: boolean,
  *   equalOperator: 'IS' | '=',
@@ -366,6 +376,7 @@ function sql(expressionOrPick, context) {
 function expressionToSql(operator) {
   const context = {
     values: [],
+    tablesUsed: [],
   };
   return {
     sql: sql(operator, context),

package/lib/operators.js

@@ -90,6 +90,20 @@ const operators = {
     });
   },
 
+  lower(value) {
+    return /** @type {const} */ ({
+      operator: 'lower',
+      value: op(value),
+    });
+  },
+
+  upper(value) {
+    return /** @type {const} */ ({
+      operator: 'upper',
+      value: op(value),
+    });
+  },
+
   substr(value, start, length) {
     value = op(value);
     start = op(start);

package/lib/picks.js

@@ -86,6 +86,14 @@ class ValuePick extends BasePick {
     super(type, expression);
   }
 
+  /**
+   * @template {AnyTypeOrShape} T
+   * @param {T} type
+   */
+  as(type) {
+    return makePick(type, this.expression);
+  }
+
   /**
    * @template {AnyObjectShape} T
    * @param {T} shape
@@ -179,6 +187,14 @@ class StringPick extends ValuePick {
     return new NumberPick(number, $o.stringLength(this.expression));
   }
 
+  lower() {
+    return new StringPick(this.type, $o.lower(this.expression));
+  }
+
+  upper() {
+    return new StringPick(this.type, $o.upper(this.expression));
+  }
+
   /**
    * @param {number | BasePick<NumberType>} start
    * @param {number | BasePick<NumberType>} [length]

package/lib/query-builder.js

@@ -1,5 +1,6 @@
 // @ts-check
 
+const path = require('node:path');
 const {
   ObjectType,
   ArrayType,
@@ -43,11 +44,15 @@ const partialObjectShape = require('./partial-object-shape.js');
  */
 
 /**
- * @typedef {{db?: string, table: string, alias?: string} | {db?: undefined, table: Subquery, alias?: string}} TableAndAlias
+ * @typedef {{db?: string, dbId?: string, table: string, alias?: string}} DbTable
  */
 
 /**
- * @typedef {string | Subquery | TableAndAlias} QueryTable
+ * @typedef {{db?: undefined, dbId?: undefined, table: Subquery, alias?: string}} SubqueryAndAlias
+ */
+
+/**
+ * @typedef {string | Subquery | DbTable | SubqueryAndAlias} QueryTable
  */
 
 /**
@@ -55,6 +60,7 @@ const partialObjectShape = require('./partial-object-shape.js');
  * @template {AnyObjectShape} U
  * @typedef {{
  *   db?: string,
+ *   dbId?: string,
  *   table: string,
  *   alias?: string,
  *   shape?: T,
@@ -281,9 +287,15 @@ function getTableName(table) {
  * @template {AnyObjectShape} T
  * @param {AnyTableSchema} tableSchema
  * @param {T} shape
- * @returns {{pick: RowPick<GetShape<T>>, condition: BooleanPick | null}}
+ * @returns {{table: DbTable, pick: RowPick<GetShape<T>>, condition: BooleanPick | null}}
  */
 function useTableSchema(tableSchema, shape) {
+  const table = {
+    db: tableSchema.db,
+    dbId: tableSchema.dbId,
+    table: tableSchema.table,
+    alias: tableSchema.alias,
+  };
   const type = toObjectType(shape);
   const tableName = getTableName(tableSchema);
   let pick = rowPick(type, tableName);
@@ -295,7 +307,7 @@ function useTableSchema(tableSchema, shape) {
     }
     pick = tableSchema.scope(basePick).toRowPick();
   }
-  return {pick, condition};
+  return {table, pick, condition};
 }
 
 /**
@@ -456,6 +468,15 @@ class FinalQuery {
     return queryToSql(this.#queryParts, null).sql;
   }
 
+  json() {
+    const {sql, values, tables} = queryToSql(this.#queryParts);
+    return {sql, values, tables};
+  }
+
+  getMapRow() {
+    return this.#getMapRow();
+  }
+
   /**
    * @returns {R | undefined}
    */
@@ -693,14 +714,14 @@ class FromQuery {
    */
   _join(joinOperator, tableName, shape, joinFct, mergePicks) {
     const tableSchema = this.#getTableSchema(tableName, shape);
-    const {pick, condition} = useTableSchema(tableSchema, shape);
+    const {table, pick, condition} = useTableSchema(tableSchema, shape);
 
     const joinCondition = joinFct(...this.#picks, pick, pickOperators);
     const queryParts = {
       ...this.#queryParts,
       joins: mergeJoin(this.#queryParts.joins, {
         operator: joinOperator,
-        table: tableSchema,
+        table,
         constraint: condition
           ? pickOperators.and(condition, joinCondition)
           : joinCondition,
@@ -945,12 +966,11 @@ class QueryBuilder {
    */
   from(tableName, shape) {
     const tableSchema = this.#getTableSchema(tableName, shape);
-    const from = tableSchema;
+    const {table, pick, condition} = useTableSchema(tableSchema, shape);
     const queryParts = {
-      from,
+      from: table,
       withs: this.#withs,
     };
-    const {pick, condition} = useTableSchema(tableSchema, shape);
     if (condition) {
       queryParts.where = condition;
     }
@@ -966,4 +986,5 @@ class QueryBuilder {
 module.exports = {
   QueryBuilder,
   FromQuery,
+  FinalQuery,
 };

package/lib/query-to-sql.js

@@ -1,5 +1,6 @@
 // @ts-check
 /**
+ * @typedef {import("./query-builder.js").DbTable} DbTable
  * @typedef {import("./query-builder.js").QueryObj} QueryObj
  * @typedef {import("./operator-to-sql.js").ExpressionToSqlContext} ExpressionToSqlContext
  */
@@ -21,7 +22,8 @@ function withSql(withs, context) {
     .map(({name, query}) => {
       let sql = '';
       sql += `${name} AS (\n`;
-      sql += queryToSql(query, context.values).sql;
+      sql += queryToSql(query, context.values, {tablesUsed: context.tablesUsed})
+        .sql;
       sql += '\n)';
       return sql;
     })
@@ -37,6 +39,7 @@ function withSql(withs, context) {
 function tableSql(table, context) {
   // Note: table is not validated
   if (typeof table === 'string') {
+    context.tablesUsed.push({table});
     return table;
   }
   if (!('table' in table)) {
@@ -44,6 +47,7 @@ function tableSql(table, context) {
   }
   let resultSql = '';
   if (typeof table.table === 'string') {
+    context.tablesUsed.push(table);
     if (typeof table.db === 'string') {
       resultSql += `${table.db}.`;
     }
@@ -123,12 +127,13 @@ function groupByFields(groupBy, context) {
  * @param {QueryObj} query
  * @param {any[] | null} [values]
  * @param {Partial<ExpressionToSqlContext>} [options]
- * @returns {{sql: string, values: any[] | null}}
+ * @returns {{sql: string, values: any[] | null, tables: DbTable[]}}
  */
 function queryToSql(query, values = [], options = {}) {
   /** @type {ExpressionToSqlContext} */
   const context = {
     values,
+    tablesUsed: [],
     scope: query.scope,
     useTableNames: query.joins && query.joins.length > 0,
     equalOperator: 'IS',
@@ -169,7 +174,7 @@ function queryToSql(query, values = [], options = {}) {
     }
     result += '\n' + `OFFSET ${query.offset}`;
   }
-  return {sql: result, values};
+  return {sql: result, values, tables: context.tablesUsed};
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcraft-core-pickaxe",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Query builder",
   "main": "index.js",
   "scripts": {