Merge pull request dresende#214 from pjoe/sqlite-strdate

dresende · dresende · commit 28dba9bb4507 · 2013-07-02T01:58:07.000-07:00
Sqlite dates as strings
diff --git a/Readme.md b/Readme.md
@@ -149,6 +149,8 @@ orm.connect("mysql://username:password@host/database?pool=true", function (err,
 
 **Note:** `pool` is only supported by mysql & postgres. When 'pool' is set to true, your database connections are cached so that connections can be reused, optimizing performance.
 
+**Note:** `strdates` is only supported by sqlite. When true, date fields are saved as strings, compatible with django
+
 Or as an object:
 
 ```js
@@ -161,7 +163,8 @@ var opts = {
   password : "..",
   query    : {
     pool     : true|false,   // optional, false by default
-    debug    : true|false    // optional, false by default
+    debug    : true|false,   // optional, false by default
+    strdates : true|false    // optional, false by default
   }
 };
 orm.connect(opts, function (err, db) {
diff --git a/lib/Drivers/DML/sqlite.js b/lib/Drivers/DML/sqlite.js
@@ -207,6 +207,13 @@ Driver.prototype.valueToProperty = function (value, property) {
 				return null;
 			}
 			break;
+		case "date":
+			if (typeof value === 'string') {
+				if (value.indexOf('Z', value.length - 1) === -1) {
+					return new Date(value + 'Z');
+				}
+			}
+			return new Date(value);
 		default:
 			return value;
 	}
@@ -218,6 +225,48 @@ Driver.prototype.propertyToValue = function (value, property) {
 			return (value) ? 1 : 0;
 		case "object":
 			return JSON.stringify(value);
+		case "date":
+			if (this.config.query.strdates) {
+				if (value instanceof Date) {
+					var year = value.getUTCFullYear();
+					var month = value.getUTCMonth() + 1;
+					if (month < 10) {
+						month = '0' + month;
+					}
+					var date = value.getUTCDate();
+					if (date < 10) {
+						date = '0' + date;
+					}
+					var strdate = year + '-' + month + '-' + date;
+					if (property.time === false) {
+						return strdate;
+					}
+
+					var hours = value.getUTCHours();
+					if (hours < 10) {
+						hours = '0' + hours;
+					}
+					var minutes = value.getUTCMinutes();
+					if (minutes < 10) {
+						minutes = '0' + minutes;
+					}
+					var seconds = value.getUTCSeconds();
+					if (seconds < 10) {
+						seconds = '0' + seconds;
+					}
+					var millis = value.getUTCMilliseconds();
+					if (millis < 10) {
+						millis = '0' + millis;
+					}
+					if (millis < 100) {
+						millis = '0' + millis;
+					}
+					strdate += ' ' + hours + ':' + minutes + ':' + seconds + '.' + millis + '000';
+					return  strdate; 
+				}
+
+			}
+			return value;
 		default:
 			return value;
 	}
