55const sql = require ( '../../tedious.js' )
66const assert = require ( 'assert' )
77const { join } = require ( 'path' )
8+ const { readFileSync } = require ( 'fs' )
89
910const TESTS = require ( '../common/tests.js' ) ( sql , 'tedious' )
1011const TIMES = require ( '../common/times.js' ) ( sql , 'tedious' )
@@ -16,7 +17,7 @@ if (parseInt(process.version.match(/^v(\d+)\./)[1]) > 0) {
1617}
1718
1819const config = function ( ) {
19- const cfg = JSON . parse ( require ( 'fs' ) . readFileSync ( join ( __dirname , '../.mssql.json' ) ) )
20+ const cfg = JSON . parse ( readFileSync ( join ( __dirname , '../.mssql.json' ) ) )
2021 cfg . driver = 'tedious'
2122 return cfg
2223}
@@ -25,23 +26,22 @@ let connection1 = null
2526let connection2 = null
2627
2728describe ( 'tedious' , ( ) => {
28- before ( done =>
29- sql . connect ( config ( ) , err => {
30- if ( err ) return done ( err )
31-
32- let req = new sql . Request ( )
33- req . query ( require ( 'fs' ) . readFileSync ( join ( __dirname , '../cleanup.sql' ) , 'utf8' ) , err => {
34- if ( err ) return done ( err )
35-
36- req = new sql . Request ( )
37- req . query ( require ( 'fs' ) . readFileSync ( join ( __dirname , '../prepare.sql' ) , 'utf8' ) , err => {
38- if ( err ) return done ( err )
39-
40- sql . close ( done )
29+ before ( done => {
30+ try {
31+ sql . connect ( config ( ) )
32+ . then ( ( ) => {
33+ return new sql . Request ( ) . query ( readFileSync ( join ( __dirname , '../cleanup.sql' ) , 'utf8' ) )
4134 } )
42- } )
43- } )
44- )
35+ . then ( ( ) => {
36+ return new sql . Request ( ) . query ( readFileSync ( join ( __dirname , '../prepare.sql' ) , 'utf8' ) )
37+ } )
38+ . catch ( done )
39+ . then ( ( ) => sql . close ( ) )
40+ . then ( ( ) => done ( ) )
41+ } catch ( e ) {
42+ done ( e )
43+ }
44+ } )
4545 afterEach ( ( ) => sql . valueHandler . clear ( ) )
4646
4747 describe ( 'basic test suite' , ( ) => {
@@ -99,6 +99,7 @@ describe('tedious', () => {
9999 it ( 'connection healthy works' , done => TESTS [ 'connection healthy works' ] ( config ( ) , done ) )
100100 it ( 'healthy connection goes bad' , done => TESTS [ 'healthy connection goes bad' ] ( config ( ) , done ) )
101101 it ( 'request timeout' , done => TESTS [ 'request timeout' ] ( done , 'tedious' , / T i m e o u t : R e q u e s t f a i l e d t o c o m p l e t e i n 1 0 0 0 m s / ) )
102+ it ( 'BigInt casted types' , done => TESTS [ 'BigInt casted types' ] ( done ) )
102103 it ( 'dataLength type correction' , done => TESTS [ 'dataLength type correction' ] ( done ) )
103104 it ( 'type validation' , done => TESTS [ 'type validation' ] ( 'query' , done ) )
104105 it ( 'type validation (batch)' , done => TESTS [ 'type validation' ] ( 'batch' , done ) )
@@ -344,7 +345,7 @@ describe('tedious', () => {
344345 if ( err ) return done ( err )
345346
346347 const req = new sql . Request ( )
347- req . query ( require ( 'fs' ) . readFileSync ( join ( __dirname , '../cleanup.sql' ) , 'utf8' ) , function ( err ) {
348+ req . query ( readFileSync ( join ( __dirname , '../cleanup.sql' ) , 'utf8' ) , function ( err ) {
348349 if ( err ) return done ( err )
349350
350351 sql . close ( done )
0 commit comments