@ronin/compiler 0.11.0-leo-ron-1083-experimental-228 → 0.11.1-default-value-experimental-230

package/dist/index.js

@@ -20,6 +20,7 @@ var RONIN_MODEL_FIELD_REGEX = new RegExp(
   `${QUERY_SYMBOLS.FIELD}[_a-zA-Z0-9.]+`,
   "g"
 );
+var RAW_FIELD_TYPES = ["string", "number", "boolean"];
 var composeIncludedTableAlias = (fieldSlug) => `including_${fieldSlug}`;
 var MODEL_ENTITY_ERROR_CODES = {
   field: "FIELD_NOT_FOUND",
@@ -642,7 +643,7 @@ var getFieldStatement = (models, model, field) => {
   if (field.unique === true) statement += " UNIQUE";
   if (field.required === true) statement += " NOT NULL";
   if (typeof field.defaultValue !== "undefined")
-    statement += ` DEFAULT ${field.defaultValue}`;
+    statement += ` DEFAULT ${typeof field.defaultValue === "string" ? `'${field.defaultValue}'` : field.defaultValue}`;
   if (field.collation) statement += ` COLLATE ${field.collation}`;
   if (field.increment === true) statement += " AUTOINCREMENT";
   if (typeof field.check !== "undefined") {
@@ -1152,9 +1153,6 @@ var handleIncluding = (models, model, statementParams, instruction) => {
     statement += `${joinType} JOIN ${relatedTableSelector} as ${tableAlias}`;
     model.tableAlias = model.tableAlias || model.table;
     if (joinType === "LEFT") {
-      if (!single) {
-        tableSubQuery = `SELECT * FROM "${model.table}" LIMIT 1`;
-      }
       const subStatement = composeConditions(
         models,
         { ...relatedModel, tableAlias },
@@ -1167,6 +1165,7 @@ var handleIncluding = (models, model, statementParams, instruction) => {
       );
       statement += ` ON (${subStatement})`;
     }
+    if (!single) tableSubQuery = `SELECT * FROM "${model.table}" LIMIT 1`;
   }
   return { statement, tableSubQuery };
 };
@@ -1249,6 +1248,10 @@ var handleSelecting = (models, model, statementParams, instructions, options) =>
         newValue = prepareStatementValue(statementParams, value);
       }
       instructions.including[key] = newValue;
+      loadedFields.push({
+        slug: key,
+        type: RAW_FIELD_TYPES.includes(typeof value) ? typeof value : "string"
+      });
     }
   }
   const expandColumns = isJoining && options?.expandColumns;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ronin/compiler",
-  "version": "0.11.0-leo-ron-1083-experimental-228",
+  "version": "0.11.1-default-value-experimental-230",
   "type": "module",
   "description": "Compiles RONIN queries to SQL statements.",
   "publishConfig": {