|
18 | 18 |
|
19 | 19 | function odbcCall(config, xmlInput, done) { |
20 | 20 | // eslint-disable-next-line global-require |
21 | | - const { Connection } = require('odbc'); |
| 21 | + const odbc = require('odbc'); |
22 | 22 |
|
23 | 23 | const { |
24 | 24 | host = 'localhost', |
@@ -52,39 +52,30 @@ function odbcCall(config, xmlInput, done) { |
52 | 52 | console.log(`SQL to run is ${sql}`); |
53 | 53 | } |
54 | 54 |
|
55 | | - let connection; |
56 | | - |
57 | | - // potentially throws an error with invalid SYSTEM, UID, PWD |
58 | | - try { |
59 | | - connection = new Connection(connectionString); |
60 | | - } catch (error) { |
61 | | - done(error, null); |
62 | | - } |
63 | | - |
64 | | - connection.query(sql, [ipc, ctl, xmlInput], (queryError, results) => { |
65 | | - if (queryError) { |
66 | | - done(queryError, null); |
67 | | - return; |
68 | | - } |
69 | | - |
70 | | - connection.close((closeError) => { |
71 | | - if (closeError) { |
72 | | - done(closeError, null); |
| 55 | + odbc.connect(connectionString, (connectError, connection) => { |
| 56 | + connection.query(sql, [ipc, ctl, xmlInput], (queryError, results) => { |
| 57 | + if (queryError) { |
| 58 | + done(queryError, null); |
73 | 59 | return; |
74 | 60 | } |
75 | | - |
76 | | - if (!results) { |
77 | | - done('Empty result set was returned', null); |
78 | | - return; |
79 | | - } |
80 | | - |
81 | | - let xmlOutput = ''; |
82 | | - |
83 | | - results.forEach((chunk) => { |
84 | | - xmlOutput += chunk.OUT151; |
| 61 | + connection.close((closeError) => { |
| 62 | + if (closeError) { |
| 63 | + done(closeError, null); |
| 64 | + return; |
| 65 | + } |
| 66 | + |
| 67 | + if (!results) { |
| 68 | + done('Empty result set was returned', null); |
| 69 | + return; |
| 70 | + } |
| 71 | + |
| 72 | + let xmlOutput = ''; |
| 73 | + |
| 74 | + results.forEach((chunk) => { |
| 75 | + xmlOutput += chunk.OUT151; |
| 76 | + }); |
| 77 | + done(null, xmlOutput); |
85 | 78 | }); |
86 | | - |
87 | | - done(null, xmlOutput); |
88 | 79 | }); |
89 | 80 | }); |
90 | 81 | } |
|
0 commit comments