fix(schema): schema.now must return knex query builder instance

Since, the schema calls are directly handled by knex, we must
return knex.raw instance for it to handle it properly

adonis-typings/querybuilder.ts

@@ -592,6 +592,7 @@ declare module '@ioc:Adonis/Lucid/DatabaseQueryBuilder' {
    */
   interface RawContract {
     client: QueryClientContract,
+    toKnex (): knex.Raw,
     wrap (before: string, after: string): this
   }
 

adonis-typings/schema.ts

@@ -10,7 +10,7 @@
 declare module '@ioc:Adonis/Lucid/Schema' {
   import { QueryClientContract, ExcutableQueryBuilderContract } from '@ioc:Adonis/Lucid/Database'
   import { RawContract } from '@ioc:Adonis/Lucid/DatabaseQueryBuilder'
-  import { SchemaBuilder } from 'knex'
+  import { SchemaBuilder, Raw } from 'knex'
 
   export type DeferCallback = (client: QueryClientContract) => void | Promise<void>
 
@@ -25,7 +25,7 @@ declare module '@ioc:Adonis/Lucid/Schema' {
     schema: SchemaBuilder
     file: string
 
-    now (precision?: number): RawContract & ExcutableQueryBuilderContract<any>
+    now (precision?: number): Raw
     defer: (cb: DeferCallback) => void
     up (): Promise<void> | void
     down (): Promise<void> | void

src/Database/QueryBuilder/Raw.ts

@@ -54,4 +54,11 @@ export class RawQueryBuilder implements RawContract {
     this.$knexBuilder.wrap(before, after)
     return this
   }
+
+  /**
+   * Returns reference to knex raw query
+   */
+  public toKnex () {
+    return this.$knexBuilder
+  }
 }

src/Schema/index.ts

@@ -77,8 +77,8 @@ export class Schema implements SchemaContract {
    */
   public now (precision?: number) {
     return precision
-      ? this.db.raw(`CURRENT_TIMESTAMP(${precision})`)
-      : this.db.raw('CURRENT_TIMESTAMP')
+      ? this.db.raw(`CURRENT_TIMESTAMP(${precision})`).toKnex()
+      : this.db.raw('CURRENT_TIMESTAMP').toKnex()
   }
 
   /**

test/migrations/schema.spec.ts

@@ -62,7 +62,7 @@ test.group('Schema', (group) => {
     assert.deepEqual(queries, [knexSchema])
   })
 
-  test('get raw query builder using now method', async (assert) => {
+  test('get knex raw query builder using now method', async (assert) => {
     class UsersSchema extends getBaseSchema() {
       public up () {
         this.schema.createTable('users', (table) => {
@@ -208,4 +208,25 @@ test.group('Schema', (group) => {
     assert.isFalse(hasUsers)
     assert.isFalse(hasAccounts)
   })
+
+  test('use now helper to define default timestamp', async (assert) => {
+    class UsersSchema extends getBaseSchema() {
+      public up () {
+        this.schema.createTable('users', (table) => {
+          table.increments('id')
+          table.timestamp('created_at').defaultTo(this.now())
+        })
+      }
+    }
+
+    const schema = new UsersSchema(db.connection(), 'users.ts', true)
+    const queries = await schema.execUp()
+
+    const knexSchema = db.connection().schema.createTable('users', (table) => {
+      table.increments('id')
+      table.timestamp('created_at').defaultTo(db.connection().getWriteClient().fn.now())
+    }).toQuery()
+
+    assert.deepEqual(queries, [knexSchema])
+  })
 })