@ronin/compiler 0.14.9-leo-ron-1099-1-experimental-341 → 0.14.9-leo-ron-1099-1-experimental-343

package/README.md

@@ -127,26 +127,7 @@ new Transaction(queries, {
   // Instead of returning an array of parameters for every statement (which allows for
   // preventing SQL injections), all parameters are inlined directly into the SQL strings.
   // This option should only be used if the generated SQL will be manually verified.
-  inlineParams: true,
-
-  // By default, in the generated SQL statements, the compiler does not alias columns if
-  // multiple different tables with the same column names are being joined. Only the table
-  // names themselves are aliased.
-  //
-  // This ensures the cleanest possible SQL statements in conjunction with the default
-  // behavior of SQL databases, where the result of a statement is a list (array) of
-  // values, which are inherently not prone to conflicts.
-  //
-  // If the driver being used instead returns an object for every row, the driver must
-  // ensure the uniqueness of every key in that object, which means prefixing duplicated
-  // column names with the name of the respective table, if multiple tables are joined
-  // (example for an object key: "table_name.column_name").
-  //
-  // Drivers that return objects for rows offer this behavior as an option that is
-  // usually called "expand columns". If the driver being used does not offer such an
-  // option, you can instead activate the option in the compiler, which results in longer
-  // SQL statements because all column names are aliased.
-  expandColumns: true
+  inlineParams: true
 });
 ```
 

package/dist/index.d.ts

@@ -394,8 +394,6 @@ interface TransactionOptions {
      * separating them out into a dedicated `params` array.
      */
     inlineParams?: boolean;
-    /** Alias column names that are duplicated when joining multiple tables. */
-    expandColumns?: boolean;
 }
 declare class Transaction {
     #private;

package/dist/index.js

@@ -424,7 +424,6 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     }
     return newField;
   });
-  if (instructions.selecting) options.expandColumns = true;
   const joinedSelectedFields = [];
   const joinedColumns = [];
   if (instructions.including) {
@@ -440,7 +439,6 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
         const { queryModel, queryInstructions } = splitQuery(symbol2.value);
         const subQueryModel = getModelBySlug(models, queryModel);
         isJoining = true;
-        if (queryInstructions?.selecting) options.expandColumns = true;
         const subSingle = queryModel !== subQueryModel.pluralSlug;
         if (!model.tableAlias)
           model.tableAlias = single && !subSingle ? `sub_${model.table}` : model.table;
@@ -478,11 +476,7 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
       });
     }
   }
-  let columns = ["*"];
-  const fieldsToExpand = options.expandColumns ? selectedFields : selectedFields.filter(
-    (loadedField) => typeof loadedField.mountedValue !== "undefined"
-  );
-  const extraColumns = fieldsToExpand.map((selectedField) => {
+  const columns = selectedFields.map((selectedField) => {
     if (selectedField.mountedValue) {
       return `${selectedField.mountedValue} as "${selectedField.slug}"`;
     }
@@ -494,11 +488,6 @@ var handleSelecting = (models, model, statementParams, single, instructions, opt
     }
     return fieldSelector;
   });
-  if (options.expandColumns) {
-    columns = extraColumns;
-  } else if (extraColumns) {
-    columns.push(...extraColumns);
-  }
   columns.push(...joinedColumns);
   selectedFields.push(...joinedSelectedFields);
   return { columns: columns.join(", "), isJoining, selectedFields };
@@ -648,8 +637,7 @@ var compileQueryInput = (defaultQuery, models, statementParams, options) => {
     {
       selecting: instructions?.selecting,
       including: instructions?.including
-    },
-    options
+    }
   );
   let statement = "";
   switch (queryType) {
@@ -1995,8 +1983,7 @@ var Transaction = class {
       const { dependencies, main, selectedFields } = compileQueryInput(
         query,
         modelsWithPresets,
-        options?.inlineParams ? null : [],
-        { expandColumns: options?.expandColumns }
+        options?.inlineParams ? null : []
       );
       const preDependencies = dependencies.filter(({ after }) => !after);
       const postDependencies = dependencies.map(({ after, ...rest }) => after ? rest : null).filter((item) => item != null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.14.9-leo-ron-1099-1-experimental-341",
+  "version": "0.14.9-leo-ron-1099-1-experimental-343",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {