orange-orm 4.7.6 → 4.7.7

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 (7) hide show
  1. package/dist/index.mjs +6 -9
  2. package/docs/changelog.md +2 -0
  3. package/package.json +1 -1
  4. package/src/bunPg/wrapQuery.js +1 -2
  5. package/src/oracle/wrapQuery.js +1 -1
  6. package/src/pg/wrapQuery.js +1 -1
  7. package/src/tedious/wrapQuery.js +3 -5
package/dist/index.mjs CHANGED
@@ -14833,11 +14833,10 @@ function requireWrapQuery$8 () {
14833
14833
 
14834
14834
  async function runQuery(query, onCompleted) {
14835
14835
  try {
14836
-
14836
+ log.emitQuery({ sql: query.sql(), parameters: query.parameters });
14837
14837
  const sql = replaceParamChar(query, query.parameters);
14838
14838
  let rdb = tryGetSessionContext(context);
14839
14839
  let transactionHandler = rdb.transactionHandler;
14840
- log.emitQuery({ sql, parameters: query.parameters });
14841
14840
 
14842
14841
  if (sql.length < 18 && query.parameters.length === 0) {
14843
14842
  if (sql === 'BEGIN TRANSACTION' || sql === 'BEGIN') {
@@ -15337,13 +15336,13 @@ function requireWrapQuery$7 () {
15337
15336
 
15338
15337
  function runQuery(query, onCompleted) {
15339
15338
  var params = query.parameters;
15339
+ log.emitQuery({sql: query.sql(), parameters: params});
15340
15340
  var sql = replaceParamChar(query, params);
15341
15341
  query = {
15342
15342
  text: sql,
15343
15343
  values: params,
15344
15344
  types: query.types
15345
15345
  };
15346
- log.emitQuery({sql, parameters: params});
15347
15346
 
15348
15347
  runOriginalQuery.call(connection, query, onInnerCompleted);
15349
15348
 
@@ -18271,26 +18270,25 @@ function requireWrapQuery$1 () {
18271
18270
 
18272
18271
  function doQuery(query, onCompleted) {
18273
18272
  const result = [];
18273
+
18274
+ log.emitQuery({ sql: query.sql(), parameters: query.parameters });
18274
18275
  const sql = replaceParamChar(query.sql(), query.parameters);
18275
18276
 
18276
18277
  // Transaction statements
18277
18278
  if (sql.length < 18 && query.parameters.length === 0) {
18278
18279
  if (sql === 'BEGIN TRANSACTION') {
18279
- log.emitQuery({ sql, parameters: [] });
18280
18280
  connection.beginTransaction((err) => {
18281
18281
  onCompleted(extractError(err), []);
18282
18282
  });
18283
18283
  return;
18284
18284
  }
18285
18285
  else if (sql === 'COMMIT') {
18286
- log.emitQuery({ sql, parameters: [] });
18287
18286
  connection.commitTransaction((err) => {
18288
18287
  onCompleted(extractError(err), []);
18289
18288
  });
18290
18289
  return;
18291
18290
  }
18292
18291
  else if (sql === 'ROLLBACK') {
18293
- log.emitQuery({ sql, parameters: [] });
18294
18292
  connection.rollbackTransaction((err) => {
18295
18293
  onCompleted(extractError(err), []);
18296
18294
  });
@@ -18301,7 +18299,7 @@ function requireWrapQuery$1 () {
18301
18299
  let keys;
18302
18300
  // Now we can safely create Request using CachedRequest
18303
18301
  var request = new CachedRequest(sql, onInnerCompleted);
18304
- const params = addParameters(request, query.parameters, CachedTypes);
18302
+ addParameters(request, query.parameters, CachedTypes);
18305
18303
 
18306
18304
  request.on('row', rows => {
18307
18305
  const tmp = {};
@@ -18314,7 +18312,6 @@ function requireWrapQuery$1 () {
18314
18312
  result.push(tmp);
18315
18313
  });
18316
18314
 
18317
- log.emitQuery({ sql, parameters: params });
18318
18315
  connection.execSql(request);
18319
18316
 
18320
18317
  function onInnerCompleted(err) {
@@ -19697,8 +19694,8 @@ function requireWrapQuery () {
19697
19694
 
19698
19695
  function runQuery(query, onCompleted) {
19699
19696
  var params = query.parameters;
19697
+ log.emitQuery({sql: query.sql(), parameters: params});
19700
19698
  var sql = replaceParamChar(query, params);
19701
- log.emitQuery({ sql, parameters: params });
19702
19699
 
19703
19700
  runOriginalQuery.call(connection, sql, params, {
19704
19701
  fetchTypeHandler: function(metaData) {
package/docs/changelog.md CHANGED
@@ -1,4 +1,6 @@
1
1
  ## Changelog
2
+ __4.7.7__
3
+ Always do logging with question mark as placeholder instead of dialect specific placeholder.
2
4
  __4.7.6__
3
5
  Changed logging for SAP ASE.
4
6
  __4.7.5__
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "orange-orm",
3
- "version": "4.7.6",
3
+ "version": "4.7.7",
4
4
  "main": "./src/index.js",
5
5
  "module": "./dist/index.mjs",
6
6
  "browser": "./dist/index.browser.mjs",
package/src/bunPg/wrapQuery.js CHANGED
@@ -7,11 +7,10 @@ function wrapQuery(context, connection) {
7
7
 
8
8
  async function runQuery(query, onCompleted) {
9
9
  try {
10
-
10
+ log.emitQuery({ sql: query.sql(), parameters: query.parameters });
11
11
  const sql = replaceParamChar(query, query.parameters);
12
12
  let rdb = tryGetSessionContext(context);
13
13
  let transactionHandler = rdb.transactionHandler;
14
- log.emitQuery({ sql, parameters: query.parameters });
15
14
 
16
15
  if (sql.length < 18 && query.parameters.length === 0) {
17
16
  if (sql === 'BEGIN TRANSACTION' || sql === 'BEGIN') {
package/src/oracle/wrapQuery.js CHANGED
@@ -7,8 +7,8 @@ function wrapQuery(_context, connection) {
7
7
 
8
8
  function runQuery(query, onCompleted) {
9
9
  var params = query.parameters;
10
+ log.emitQuery({sql: query.sql(), parameters: params});
10
11
  var sql = replaceParamChar(query, params);
11
- log.emitQuery({ sql, parameters: params });
12
12
 
13
13
  runOriginalQuery.call(connection, sql, params, {
14
14
  fetchTypeHandler: function(metaData) {
package/src/pg/wrapQuery.js CHANGED
@@ -7,13 +7,13 @@ function wrapQuery(_context, connection) {
7
7
 
8
8
  function runQuery(query, onCompleted) {
9
9
  var params = query.parameters;
10
+ log.emitQuery({sql: query.sql(), parameters: params});
10
11
  var sql = replaceParamChar(query, params);
11
12
  query = {
12
13
  text: sql,
13
14
  values: params,
14
15
  types: query.types
15
16
  };
16
- log.emitQuery({sql, parameters: params});
17
17
 
18
18
  runOriginalQuery.call(connection, query, onInnerCompleted);
19
19
 
package/src/tedious/wrapQuery.js CHANGED
@@ -23,26 +23,25 @@ function wrapQuery(_context, connection) {
23
23
 
24
24
  function doQuery(query, onCompleted) {
25
25
  const result = [];
26
+
27
+ log.emitQuery({ sql: query.sql(), parameters: query.parameters });
26
28
  const sql = replaceParamChar(query.sql(), query.parameters);
27
29
 
28
30
  // Transaction statements
29
31
  if (sql.length < 18 && query.parameters.length === 0) {
30
32
  if (sql === 'BEGIN TRANSACTION') {
31
- log.emitQuery({ sql, parameters: [] });
32
33
  connection.beginTransaction((err) => {
33
34
  onCompleted(extractError(err), []);
34
35
  });
35
36
  return;
36
37
  }
37
38
  else if (sql === 'COMMIT') {
38
- log.emitQuery({ sql, parameters: [] });
39
39
  connection.commitTransaction((err) => {
40
40
  onCompleted(extractError(err), []);
41
41
  });
42
42
  return;
43
43
  }
44
44
  else if (sql === 'ROLLBACK') {
45
- log.emitQuery({ sql, parameters: [] });
46
45
  connection.rollbackTransaction((err) => {
47
46
  onCompleted(extractError(err), []);
48
47
  });
@@ -53,7 +52,7 @@ function wrapQuery(_context, connection) {
53
52
  let keys;
54
53
  // Now we can safely create Request using CachedRequest
55
54
  var request = new CachedRequest(sql, onInnerCompleted);
56
- const params = addParameters(request, query.parameters, CachedTypes);
55
+ addParameters(request, query.parameters, CachedTypes);
57
56
 
58
57
  request.on('row', rows => {
59
58
  const tmp = {};
@@ -66,7 +65,6 @@ function wrapQuery(_context, connection) {
66
65
  result.push(tmp);
67
66
  });
68
67
 
69
- log.emitQuery({ sql, parameters: params });
70
68
  connection.execSql(request);
71
69
 
72
70
  function onInnerCompleted(err) {