leoric 2.0.3 → 2.0.4

package/History.md

@@ -1,4 +1,14 @@
-2.0.3 / 2021-02-11
+2.0.4 / 2022-02-16
+==================
+
+## What's Changed
+* fix: fix unit test  error by @LB4027221 in https://github.com/cyjake/leoric/pull/269
+* fix: attribute.defaultValue should be set when init attributes by @cyjake in https://github.com/cyjake/leoric/pull/271
+
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.0.3...v2.0.4
+
+2.0.3 / 2022-02-11
 ==================
 
 ## What's Changed
@@ -9,7 +19,7 @@
 
 **Full Changelog**: https://github.com/cyjake/leoric/compare/v2.0.2...v2.0.3
 
-2.0.2 / 2021-02-10
+2.0.2 / 2022-02-10
 ==================
 
 ## What's Changed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/bone.js

@@ -152,7 +152,6 @@ class Bone {
     }
   }
 
-
   /**
    * Get or set attribute value by name. This method is quite similiar to `jQuery.attr()`. If the attribute isn't selected when queried from database, an error will be thrown when accessing it.
    *

package/src/drivers/postgres/schema.js

@@ -57,13 +57,18 @@ module.exports = {
 
       if (dataType === 'character varying') dataType = 'varchar';
       if (dataType === 'timestamp without time zone') dataType = 'timestamp';
+
+      let columnDefault = row.column_default;
+      if (/^NULL::/i.test(columnDefault)) columnDefault = null;
+      if (dataType === 'boolean') columnDefault = columnDefault === 'true';
+
       const primaryKey = row.constraint_type === 'PRIMARY KEY';
       const precision = row.datetime_precision;
 
       columns.push({
         columnName: row.column_name,
         columnType: length > 0 ? `${dataType}(${length})` : dataType,
-        defaultValue: primaryKey ? null : row.column_default,
+        defaultValue: primaryKey ? null : columnDefault,
         dataType,
         allowNull: row.is_nullable !== 'NO',
         // https://www.postgresql.org/docs/9.5/infoschema-table-constraints.html

package/src/drivers/sqlite/schema.js

@@ -75,8 +75,9 @@ async function alterTableWithChangeColumn(driver, table, changes) {
 }
 
 // eslint-disable-next-line no-unused-vars
-function parseDefaultValue(text) {
+function parseDefaultValue(text, type) {
   if (typeof text !== 'string') return text;
+  if (type === 'boolean') return text === 'true';
 
   try {
     const ast = parseExpr(text);
@@ -84,7 +85,7 @@ function parseDefaultValue(text) {
       return ast.value;
     }
   } catch (err) {
-    debug('[parseDefaultValue] [%s] %s', text, err.stack);
+    debug('[parseDefaultValue] [%s] %s', text, err);
   }
 
   return text;
@@ -111,10 +112,11 @@ module.exports = {
         const columnType = type.toLowerCase();
         const [, dataType, precision ] = columnType.match(rColumnType);
         const primaryKey = pk === 1;
+
         const result = {
           columnName: name,
           columnType,
-          defaultValue: parseDefaultValue(dflt_value),
+          defaultValue: parseDefaultValue(dflt_value, type),
           dataType: dataType,
           allowNull: primaryKey ? false : notnull == 0,
           primaryKey,

package/src/realm.js

@@ -49,9 +49,8 @@ function initAttributes(model, columns) {
   const attributes = {};
 
   for (const columnInfo of columns) {
-    const { columnName, columnType, defaultValue, ...restInfo } = columnInfo;
+    const { columnName, columnType, ...restInfo } = columnInfo;
     const name = columnName === '_id' ? columnName : camelCase(columnName);
-    // leave out defaultValue to let database take over the default
     attributes[name] = {
       ...restInfo,
       columnName,