5
5
const sql = require ( '../../tedious.js' )
6
6
const assert = require ( 'assert' )
7
7
const { join } = require ( 'path' )
8
+ const { readFileSync } = require ( 'fs' )
8
9
9
10
const TESTS = require ( '../common/tests.js' ) ( sql , 'tedious' )
10
11
const TIMES = require ( '../common/times.js' ) ( sql , 'tedious' )
@@ -16,7 +17,7 @@ if (parseInt(process.version.match(/^v(\d+)\./)[1]) > 0) {
16
17
}
17
18
18
19
const config = function ( ) {
19
- const cfg = JSON . parse ( require ( 'fs' ) . readFileSync ( join ( __dirname , '../.mssql.json' ) ) )
20
+ const cfg = JSON . parse ( readFileSync ( join ( __dirname , '../.mssql.json' ) ) )
20
21
cfg . driver = 'tedious'
21
22
return cfg
22
23
}
@@ -25,23 +26,22 @@ let connection1 = null
25
26
let connection2 = null
26
27
27
28
describe ( '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' ) )
41
34
} )
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
+ } )
45
45
afterEach ( ( ) => sql . valueHandler . clear ( ) )
46
46
47
47
describe ( 'basic test suite' , ( ) => {
@@ -99,6 +99,7 @@ describe('tedious', () => {
99
99
it ( 'connection healthy works' , done => TESTS [ 'connection healthy works' ] ( config ( ) , done ) )
100
100
it ( 'healthy connection goes bad' , done => TESTS [ 'healthy connection goes bad' ] ( config ( ) , done ) )
101
101
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 ) )
102
103
it ( 'dataLength type correction' , done => TESTS [ 'dataLength type correction' ] ( done ) )
103
104
it ( 'type validation' , done => TESTS [ 'type validation' ] ( 'query' , done ) )
104
105
it ( 'type validation (batch)' , done => TESTS [ 'type validation' ] ( 'batch' , done ) )
@@ -344,7 +345,7 @@ describe('tedious', () => {
344
345
if ( err ) return done ( err )
345
346
346
347
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 ) {
348
349
if ( err ) return done ( err )
349
350
350
351
sql . close ( done )
0 commit comments