emilsoftware-utilities 1.2.5 → 1.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/orm.js +43 -29
  2. package/package.json +1 -1
  3. package/src/orm.ts +42 -33
package/orm.js CHANGED
@@ -28,11 +28,11 @@ exports.Orm = void 0;
28
28
  var Firebird = __importStar(require("es-node-firebird"));
29
29
  var logger_1 = require("./logger");
30
30
  var utilities_1 = require("./utilities");
31
+ var logger = new logger_1.Logger(__filename);
31
32
  var quote = function (value) {
32
33
  return "\"" + value + "\"";
33
34
  };
34
35
  var testConnection = function (options) {
35
- var logger = new logger_1.Logger(__filename);
36
36
  return new Promise(function (resolve) {
37
37
  Firebird.attach(options, function (err, db) {
38
38
  if (err) {
@@ -48,43 +48,57 @@ var testConnection = function (options) {
48
48
  };
49
49
  var query = function (options, query, parameters) {
50
50
  if (parameters === void 0) { parameters = []; }
51
- var logger = new logger_1.Logger(__filename);
52
- return new Promise(function (resolve, reject) {
53
- Firebird.attach(options, function (err, db) {
54
- if (err) {
55
- logger.error(err);
56
- return reject(err);
57
- }
58
- logger.info(utilities_1.Utilities.printQueryWithParams(query, parameters));
59
- db.query(query, parameters, function (error, result) {
60
- if (error) {
61
- logger.error(error);
62
- db.detach();
63
- return reject(error);
51
+ try {
52
+ return new Promise(function (resolve, reject) {
53
+ Firebird.attach(options, function (err, db) {
54
+ if (err) {
55
+ logger.error(err);
56
+ return reject(err);
64
57
  }
65
- db.detach();
66
- return resolve(result);
58
+ logger.info(utilities_1.Utilities.printQueryWithParams(query, parameters));
59
+ db.query(query, parameters, function (error, result) {
60
+ if (error) {
61
+ logger.error(error);
62
+ db.detach();
63
+ return reject(error);
64
+ }
65
+ db.detach();
66
+ return resolve(result);
67
+ });
67
68
  });
68
69
  });
69
- });
70
+ }
71
+ catch (error) {
72
+ logger.error(error);
73
+ throw error;
74
+ }
70
75
  };
71
76
  var execute = function (options, query, parameters) {
72
77
  if (parameters === void 0) { parameters = []; }
73
- return new Promise(function (resolve, reject) {
74
- Firebird.attach(options, function (err, db) {
75
- if (err) {
76
- return reject(err);
77
- }
78
- db.execute(query, parameters, function (error, result) {
79
- if (error) {
80
- db.detach();
81
- return reject(error);
78
+ try {
79
+ return new Promise(function (resolve, reject) {
80
+ Firebird.attach(options, function (err, db) {
81
+ if (err) {
82
+ logger.error(err);
83
+ return reject(err);
82
84
  }
83
- db.detach();
84
- return resolve(result);
85
+ logger.info(utilities_1.Utilities.printQueryWithParams(query, parameters));
86
+ db.execute(query, parameters, function (error, result) {
87
+ if (error) {
88
+ logger.error(error);
89
+ db.detach();
90
+ return reject(error);
91
+ }
92
+ db.detach();
93
+ return resolve(result);
94
+ });
85
95
  });
86
96
  });
87
- });
97
+ }
98
+ catch (error) {
99
+ logger.error(error);
100
+ throw error;
101
+ }
88
102
  };
89
103
  var trimParam = function (param) {
90
104
  if (typeof param === "string" || param instanceof String) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "emilsoftware-utilities",
3
- "version": "1.2.5",
3
+ "version": "1.2.6",
4
4
  "description": "Utilities for EmilSoftware",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/orm.ts CHANGED
@@ -4,12 +4,12 @@ import {Logger} from "./logger";
4
4
  import {Database, Options, Transaction} from "node-firebird";
5
5
  import {Utilities} from "./utilities";
6
6
 
7
+ const logger: Logger = new Logger(__filename);
7
8
 
8
9
  const quote = (value: string): string => {
9
10
  return "\"" + value + "\"";
10
11
  };
11
12
  const testConnection = (options: Options): Promise<any> => {
12
- const logger: Logger = new Logger(__filename);
13
13
  return new Promise((resolve): void => {
14
14
  Firebird.attach(options, (err: Error, db: Database): void => {
15
15
  if (err) {
@@ -24,47 +24,56 @@ const testConnection = (options: Options): Promise<any> => {
24
24
  }
25
25
 
26
26
  const query = (options: Options, query: string, parameters: any[] = []): Promise<any> => {
27
- const logger: Logger = new Logger(__filename);
28
- return new Promise((resolve, reject): void => {
29
- Firebird.attach(options, (err: any, db: {
30
- query: (arg0: any, arg1: any[], arg2: (err: any, result: any) => void) => void; detach: () => void;
31
- }) => {
32
- if (err) {
33
- logger.error(err);
34
- return reject(err);
35
- }
27
+ try {
28
+ return new Promise((resolve, reject): void => {
29
+ Firebird.attach(options, (err: any, db: Database) => {
30
+ if (err) {
31
+ logger.error(err);
32
+ return reject(err);
33
+ }
36
34
 
37
- logger.info(Utilities.printQueryWithParams(query, parameters));
38
- db.query(query, parameters, (error: any, result: any) => {
39
- if (error) {
40
- logger.error(error);
35
+ logger.info(Utilities.printQueryWithParams(query, parameters));
36
+ db.query(query, parameters, (error: any, result: any) => {
37
+ if (error) {
38
+ logger.error(error);
39
+ db.detach();
40
+ return reject(error);
41
+ }
41
42
  db.detach();
42
- return reject(error);
43
- }
44
- db.detach();
45
- return resolve(result);
43
+ return resolve(result);
44
+ });
46
45
  });
47
46
  });
48
- });
47
+ } catch (error) {
48
+ logger.error(error);
49
+ throw error;
50
+ }
49
51
  }
50
52
  const execute = (options: Options, query: string, parameters: any = []): Promise<any> => {
51
- return new Promise((resolve, reject): void => {
52
- Firebird.attach(options, (err: any, db: {
53
- execute: (arg0: any, arg1: any, arg2: (error: any, result: any) => void) => void; detach: () => void;
54
- }) => {
55
- if (err) {
56
- return reject(err);
57
- }
58
- db.execute(query, parameters, (error, result): void => {
59
- if (error) {
60
- db.detach();
61
- return reject(error);
53
+ try {
54
+ return new Promise((resolve, reject): void => {
55
+ Firebird.attach(options, (err: any, db: Database) => {
56
+ if (err) {
57
+ logger.error(err);
58
+ return reject(err);
62
59
  }
63
- db.detach();
64
- return resolve(result);
60
+
61
+ logger.info(Utilities.printQueryWithParams(query, parameters));
62
+ db.execute(query, parameters, (error, result: any): void => {
63
+ if (error) {
64
+ logger.error(error);
65
+ db.detach();
66
+ return reject(error);
67
+ }
68
+ db.detach();
69
+ return resolve(result);
70
+ });
65
71
  });
66
72
  });
67
- });
73
+ } catch (error) {
74
+ logger.error(error);
75
+ throw error;
76
+ }
68
77
  }
69
78
 
70
79
  const trimParam = (param: any): string => {