pg-mvc-service 1.0.24 → 1.0.26

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/dist/models/ExpressionClient.js +16 -3
  2. package/package.json +1 -1
  3. package/src/models/ExpressionClient.ts +14 -3
package/dist/models/ExpressionClient.js CHANGED
@@ -6,7 +6,7 @@ class ExpressionClient {
6
6
  }
7
7
  toSqlStringValue(value) {
8
8
  if (typeof value === 'string' || typeof value === 'number') {
9
- return `"${value}"`;
9
+ return `'${value}'`;
10
10
  }
11
11
  throw new Error('Please enter a value of type string or number.');
12
12
  }
@@ -40,7 +40,7 @@ class ExpressionClient {
40
40
  expression += 'null';
41
41
  }
42
42
  else if (typeof value === 'string') {
43
- expression += `"${value}"`;
43
+ expression += this.toSqlStringValue(value);
44
44
  }
45
45
  else if (typeof value === 'boolean') {
46
46
  expression += `${value}`;
@@ -50,7 +50,20 @@ class ExpressionClient {
50
50
  }
51
51
  return expression;
52
52
  });
53
- return `CASE ${whenExpression.join(' ')} END`;
53
+ let elseExpression = `ELSE `;
54
+ if (elseValue === null) {
55
+ elseExpression += 'null';
56
+ }
57
+ else if (typeof elseValue === 'string') {
58
+ elseExpression += this.toSqlStringValue(elseValue);
59
+ }
60
+ else if (typeof elseValue === 'boolean') {
61
+ elseExpression += `${elseValue}`;
62
+ }
63
+ else {
64
+ elseExpression += `${elseValue}`;
65
+ }
66
+ return `CASE ${whenExpression.join(' ')} ${elseExpression} END`;
54
67
  }
55
68
  }
56
69
  exports.default = ExpressionClient;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pg-mvc-service",
3
- "version": "1.0.24",
3
+ "version": "1.0.26",
4
4
  "description": "",
5
5
  "homepage": "https://github.com/n-daira/npm-pack_mvc-service#readme",
6
6
  "bugs": {
package/src/models/ExpressionClient.ts CHANGED
@@ -9,7 +9,7 @@ export default class ExpressionClient {
9
9
 
10
10
  public toSqlStringValue(value: any): string {
11
11
  if (typeof value === 'string' || typeof value === 'number') {
12
- return `"${value}"`;
12
+ return `'${value}'`;
13
13
  }
14
14
 
15
15
  throw new Error('Please enter a value of type string or number.');
@@ -46,7 +46,7 @@ export default class ExpressionClient {
46
46
  if (value === null) {
47
47
  expression += 'null';
48
48
  } else if (typeof value === 'string') {
49
- expression += `"${value}"`;
49
+ expression += this.toSqlStringValue(value);
50
50
  } else if (typeof value === 'boolean') {
51
51
  expression += `${value}`;
52
52
  } else {
@@ -56,6 +56,17 @@ export default class ExpressionClient {
56
56
  return expression;
57
57
  });
58
58
 
59
- return `CASE ${whenExpression.join(' ')} END`;
59
+ let elseExpression = `ELSE `;
60
+ if (elseValue === null) {
61
+ elseExpression += 'null';
62
+ } else if (typeof elseValue === 'string') {
63
+ elseExpression += this.toSqlStringValue(elseValue);
64
+ } else if (typeof elseValue === 'boolean') {
65
+ elseExpression += `${elseValue}`;
66
+ } else {
67
+ elseExpression += `${elseValue}`;
68
+ }
69
+
70
+ return `CASE ${whenExpression.join(' ')} ${elseExpression} END`;
60
71
  }
61
72
  }