More statement coverage

Author: gionatamettifogo

.gitignore

@@ -123,4 +123,5 @@ lib/
 .env
 test/assets/testing.db
 
-tools/
+tools/
+test/assets/testing-*.db

test/connection.test.ts

@@ -263,7 +263,7 @@ describe('connection', () => {
           done()
         })
       },
-      EXTRA_LONG_TIMEOUT
+      LONG_TIMEOUT
     )
   })
 

test/shared.ts

@@ -12,7 +12,7 @@ import * as dotenv from 'dotenv'
 import { SQLiteCloudConnection } from '../src'
 dotenv.config()
 
-export const LONG_TIMEOUT = 100 * 1000 // 100 seconds
+export const LONG_TIMEOUT = 1 * 60 * 1000 // 1 minute
 export const EXTRA_LONG_TIMEOUT = 15 * 60 * 1000 // 15 minutes
 
 /** Will warn if a query or other basic operation is slower than this */

test/statement.test.ts

@@ -3,60 +3,104 @@
  */
 
 import { SQLiteCloudRowset } from '../src'
-import { RowCallback, RowCountCallback } from '../src/types'
+import { RowCallback, RowCountCallback, SQLiteCloudError } from '../src/types'
 import { getChinookDatabase } from './shared'
 
-it('Database.prepare without initial bindings', done => {
+describe('Database.prepare', () => {
+  it('without incorrect bindings', done => {
+    const chinook = getChinookDatabase()
+    expect(chinook).toBeDefined()
+
+    // two bindings, but only one is provided...
+    const statement = chinook.prepare('SELECT * FROM tracks WHERE albumId = ? and trackId = ?;', 1, (err: Error, results: any) => {
+      expect(err).toBeInstanceOf(SQLiteCloudError)
+
+      chinook.close()
+      done()
+    })
+  })
+
+  it('without initial bindings', done => {
+    const chinook = getChinookDatabase()
+    expect(chinook).toBeDefined()
+    const statement = chinook.prepare('SELECT * FROM tracks WHERE albumId = ?;', (err: Error, results: any) => {
+      expect(err).toBeNull()
+    })
+
+    statement.all(3, (error, rows) => {
+      expect(error).toBeNull()
+      expect(rows).toBeDefined()
+      expect(rows).toHaveLength(3)
+      expect(rows).toBeInstanceOf(SQLiteCloudRowset)
+      expect(rows).toMatchObject([
+        {
+          AlbumId: 3,
+          Bytes: 3990994,
+          Composer: 'F. Baltes, S. Kaufman, U. Dirkscneider & W. Hoffman',
+          GenreId: 1,
+          MediaTypeId: 2,
+          Milliseconds: 230619,
+          Name: 'Fast As a Shark',
+          TrackId: 3,
+          UnitPrice: 0.99
+        },
+        {
+          AlbumId: 3,
+          Bytes: 4331779,
+          Composer: 'F. Baltes, R.A. Smith-Diesel, S. Kaufman, U. Dirkscneider & W. Hoffman',
+          GenreId: 1,
+          MediaTypeId: 2,
+          Milliseconds: 252051,
+          Name: 'Restless and Wild',
+          TrackId: 4,
+          UnitPrice: 0.99
+        },
+        {
+          AlbumId: 3,
+          Bytes: 6290521,
+          Composer: 'Deaffy & R.A. Smith-Diesel',
+          GenreId: 1,
+          MediaTypeId: 2,
+          Milliseconds: 375418,
+          Name: 'Princess of the Dawn',
+          TrackId: 5,
+          UnitPrice: 0.99
+        }
+      ])
+
+      chinook.close(error => {
+        expect(error).toBeNull()
+        done()
+      })
+    })
+  })
+})
+
+it('Statement.bind', done => {
   const chinook = getChinookDatabase()
   expect(chinook).toBeDefined()
   const statement = chinook.prepare('SELECT * FROM tracks WHERE albumId = ?;', (err: Error, results: any) => {
     expect(err).toBeNull()
   })
 
-  statement.all(3, (error, rows) => {
+  statement.bind(3, (error: Error) => {
     expect(error).toBeNull()
-    expect(rows).toBeDefined()
-    expect(rows).toHaveLength(3)
-    expect(rows).toBeInstanceOf(SQLiteCloudRowset)
-    expect(rows).toMatchObject([
-      {
-        AlbumId: 3,
-        Bytes: 3990994,
-        Composer: 'F. Baltes, S. Kaufman, U. Dirkscneider & W. Hoffman',
-        GenreId: 1,
-        MediaTypeId: 2,
-        Milliseconds: 230619,
-        Name: 'Fast As a Shark',
-        TrackId: 3,
-        UnitPrice: 0.99
-      },
-      {
-        AlbumId: 3,
-        Bytes: 4331779,
-        Composer: 'F. Baltes, R.A. Smith-Diesel, S. Kaufman, U. Dirkscneider & W. Hoffman',
-        GenreId: 1,
-        MediaTypeId: 2,
-        Milliseconds: 252051,
-        Name: 'Restless and Wild',
-        TrackId: 4,
-        UnitPrice: 0.99
-      },
-      {
-        AlbumId: 3,
-        Bytes: 6290521,
-        Composer: 'Deaffy & R.A. Smith-Diesel',
-        GenreId: 1,
-        MediaTypeId: 2,
-        Milliseconds: 375418,
-        Name: 'Princess of the Dawn',
-        TrackId: 5,
-        UnitPrice: 0.99
-      }
-    ])
 
-    chinook.close(error => {
+    statement.all((error, rows) => {
       expect(error).toBeNull()
-      done()
+      expect(rows).toBeDefined()
+      expect(rows).toHaveLength(3)
+      expect(rows).toBeInstanceOf(SQLiteCloudRowset)
+
+      // missing binding
+      statement.bind((error: Error) => {
+        expect(error).toBeInstanceOf(SQLiteCloudError)
+
+        chinook.close(error => {
+          expect(error).toBeNull()
+          done()
+        })
+      })
     })
   })
 })
@@ -148,7 +192,12 @@ it('Statement.run', done => {
   statement.run(1, error => {
     expect(error).toBeNull()
 
-    chinook.close()
-    done()
+    // run again but use same binding this time
+    statement.run(error => {
+      expect(error).toBeNull()
+
+      chinook.close()
+      done()
+    })
   })
 })