fix: store dates as ISO formatted strings

BREAKING CHANGE: date formatting has changed to improve reliability and predictability.
haltcase · Jun 2, 2019 · d2a7cda · d2a7cda
1 parent 0044ed5
commit d2a7cda
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/model.ts b/src/model.ts
@@ -71,7 +71,10 @@ export default class Model <
 
     const order = options.random ? 'random' : options.order
     let query = this.ctx.knex(this.name).select()
-    query = helpers.buildWhere(query, criteria)
+    query = helpers.buildWhere(query, this.cast.toDefinition(
+      criteria || {},
+      { raw: true, ...options }
+    ))
 
     if (order) query = helpers.buildOrder(query, order)
     if (options.limit) query = query.limit(options.limit)
@@ -114,7 +117,10 @@ export default class Model <
 
     const order = options.random ? 'random' : options.order
     let query = this.ctx.knex(this.name).first()
-    query = helpers.buildWhere(query, criteria)
+    query = helpers.buildWhere(query, this.cast.toDefinition(
+      criteria || {},
+      { raw: true, ...options }
+    ))
 
     if (order) query = helpers.buildOrder(query, order)
     if (options.skip) query = query.offset(options.skip)
@@ -373,7 +379,10 @@ async function baseCount <D extends types.ReturnDict> (
   const val = `${column} as count`
   const builder = model.ctx.knex(model.name)
   let query = options.distinct ? builder.countDistinct(val) : builder.count(val)
-  query = helpers.buildWhere(query, criteria)
+  query = helpers.buildWhere(query, model.cast.toDefinition(
+    criteria || {},
+    { raw: true, ...options }
+  ))
 
   if (options.group) query = query.groupBy(toArray(options.group))
 
@@ -393,7 +402,10 @@ async function baseMinMax <D extends types.ReturnDict> (
 
   const val = `${column} as ${method}`
   let query = model.ctx.knex(model.name)[method](val)
-  query = helpers.buildWhere(query, criteria)
+  query = helpers.buildWhere(query, model.cast.toDefinition(
+    criteria || {},
+    { raw: true, ...options }
+  ))
 
   if (options.group) query = query.groupBy(toArray(options.group))
 

diff --git a/src/schema-helpers.ts b/src/schema-helpers.ts
@@ -250,7 +250,7 @@ export function toInputType (type: string, value: any): types.StorageType | neve
     case 'increments':
       return Number(value)
     case 'date':
-      return new Date(value)
+      return (value as Date).toISOString()
     default:
       return invariant(false, `invalid type on insert to database: ${type}`)
   }

diff --git a/tests/find-or-create.ts b/tests/find-or-create.ts
@@ -23,14 +23,16 @@ test('creates missing objects or returns an existing one', async t => {
   }
 
   const fresh = await games.findOrCreate(first)
+
   t.is(await games.count({ genre: 'FPS' }), 1)
 
   const existing1 = await games.findOrCreate({ name: 'Overwatch' })
   const existing2 = await games.findOrCreate(first)
+
   t.deepEqual(fresh, existing1)
   t.deepEqual(fresh, existing2)
   t.is(await games.count({ genre: 'FPS' }), 1)
 
-  t.is(fresh!.last_played, existing1!.last_played)
-  t.is(fresh!.last_played, existing2!.last_played)
+  t.is(fresh!.last_played.toISOString(), existing1!.last_played.toISOString())
+  t.is(fresh!.last_played.toISOString(), existing2!.last_played.toISOString())
 })