@inflector/optima 1.0.17 → 1.0.19

package/dist/index.js

@@ -421,7 +421,7 @@ var escape = (val) => {
   return String(val);
 };
 var SQL_GENERATORS = {
-  eq: (c, v) => `${c} = ${escape(v)}`,
+  eq: (c, v) => v === null ? `${c} IS NULL` : `${c} = ${escape(v)}`,
   ne: (c, v) => `${c} != ${escape(v)}`,
   gt: (c, v) => `${c} > ${escape(v)}`,
   gte: (c, v) => `${c} >= ${escape(v)}`,
@@ -476,7 +476,11 @@ var OptimaTable = class _OptimaTable {
           } else if (val && typeof val === "object" && !Array.isArray(val) && !(val instanceof Date)) {
             processLevel(val, colName);
           } else {
-            conditions.push(SQL_GENERATORS.eq(colName, val));
+            if (val === null) {
+              conditions.push(SQL_GENERATORS.is(colName, null));
+            } else {
+              conditions.push(SQL_GENERATORS.eq(colName, val));
+            }
           }
         }
       };
@@ -518,8 +522,12 @@ var OptimaTable = class _OptimaTable {
         const orderedValues = columnKeys.map((key) => {
           let v = r[key];
           if (v == null) {
-            if (typeof this.Columns[key].config.default === "function") {
-              v = this.Columns[key].config.default();
+            if (this.Columns[key].config.default !== void 0) {
+              if (typeof this.Columns[key].config.default === "function") {
+                v = this.Columns[key].config.default();
+              } else {
+                v = this.Columns[key].config.default;
+              }
             } else if (this.Columns[key].config.defaultNow) {
               v = /* @__PURE__ */ new Date();
             }
@@ -667,6 +675,7 @@ ${valuesBlock}${isReturning ? "\nRETURNING *" : ""};`;
       this.Validate(record);
       record = this.Transform(record);
       const { sql } = this.BuildInsert(this.Name, [record], data.returning);
+      console.log(sql);
       const Result = await (await this.Connection.run(sql)).getRowObjects();
       const Res = this.FormatOut(Result);
       if (Res.length != 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inflector/optima",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "type": "module",
   "author": "Inflector",
   "main": "./dist/index.js",