differentiate between normal defaultValues and NOW

sdepold · May 1, 2012 · 473bce0 · 473bce0
1 parent 8921b13
commit 473bce0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/dao-factory.js b/lib/dao-factory.js
@@ -165,7 +165,7 @@ module.exports = (function() {
         var value = null
 
         if(self.rawAttributes.hasOwnProperty(name) && self.rawAttributes[name].hasOwnProperty('defaultValue')) {
-            value = self.rawAttributes[name].defaultValue
+          value = Utils.toDefaultValue(self.rawAttributes[name].defaultValue)
         }
 
         instance[name] = value

diff --git a/lib/dao.js b/lib/dao.js
@@ -249,8 +249,9 @@ module.exports = (function() {
     }
 
     Utils._.map(defaults, function(value, attr) {
-      if(!self.hasOwnProperty(attr))
-        self.addAttribute(attr, value)
+      if(!self.hasOwnProperty(attr)) {
+        self.addAttribute(attr, Utils.toDefaultValue(value))
+      }
     })
   }
 

diff --git a/lib/data-types.js b/lib/data-types.js
@@ -4,5 +4,6 @@ module.exports = {
   INTEGER: 'INTEGER',
   DATE: 'DATETIME',
   BOOLEAN: 'TINYINT(1)',
-  FLOAT: 'FLOAT'
+  FLOAT: 'FLOAT',
+  NOW: 'NOW'
 }