pg-sql2 4.7.0 → 4.11.0

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.
package/README.md CHANGED
@@ -20,8 +20,9 @@ And please give some love to our featured sponsors 🤩:
20
20
 
21
21
  <table><tr>
22
22
  <td align="center"><a href="http://chads.website"><img src="https://graphile.org/images/sponsors/chadf.png" width="90" height="90" alt="Chad Furman" /><br />Chad Furman</a> *</td>
23
- <td align="center"><a href="https://storyscript.io/?utm_source=postgraphile"><img src="https://graphile.org/images/sponsors/storyscript.png" width="90" height="90" alt="Storyscript" /><br />Storyscript</a> *</td>
24
- <td align="center"><a href="https://postlight.com/?utm_source=graphile"><img src="https://graphile.org/images/sponsors/postlight.png" width="90" height="90" alt="Postlight" /><br />Postlight</a> *</td>
23
+ <td align="center"><a href="https://storyscript.com/?utm_source=postgraphile"><img src="https://graphile.org/images/sponsors/storyscript.png" width="90" height="90" alt="Storyscript" /><br />Storyscript</a> *</td>
24
+ <td align="center"><a href="https://surge.io/"><img src="https://graphile.org/images/sponsors/surge.png" width="90" height="90" alt="Surge.io" /><br />Surge.io</a> *</td>
25
+ <td align="center"><a href="https://postlight.com/?utm_source=graphile"><img src="https://graphile.org/images/sponsors/postlight.jpg" width="90" height="90" alt="Postlight" /><br />Postlight</a> *</td>
25
26
  </tr></table>
26
27
 
27
28
  <em>\* Sponsors the entire Graphile suite</em>
@@ -40,7 +41,7 @@ const fields = ["name", "age", "height"];
40
41
  // sql.join is used to join fragments with a common separator, NOT to join tables!
41
42
  const sqlFields = sql.join(
42
43
  // sql.identifier safely escapes arguments and joins them with dots
43
- fields.map((fieldName) => sql.identifier(tableName, fieldName)),
44
+ fields.map(fieldName => sql.identifier(tableName, fieldName)),
44
45
  ", "
45
46
  );
46
47
 
@@ -119,7 +120,7 @@ have produced.
119
120
  Joins an array of sql.query values using the delimeter (which is treated as a raw SQL string); e.g.
120
121
 
121
122
  ```js
122
- const arrayOfSqlFields = ["a", "b", "c", "d"].map((n) => sql.identifier(n));
123
+ const arrayOfSqlFields = ["a", "b", "c", "d"].map(n => sql.identifier(n));
123
124
  sql.query`select ${sql.join(arrayOfSqlFields, ", ")}`; // -> select "a", "b", "c", "d"
124
125
 
125
126
  const arrayOfSqlConditions = [
@@ -49,5 +49,5 @@ export declare function literal(val: string | number | boolean | null): SQLNode;
49
49
  */
50
50
  export declare function join(items: Array<SQL>, rawSeparator?: string): SQLQuery;
51
51
  export declare function escapeSqlIdentifier(str: string): string;
52
- export declare const blank: SQLNode[];
52
+ export declare const blank: SQLQuery;
53
53
  export { query as fragment, nullNode as null };
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.null = exports.fragment = exports.blank = exports.escapeSqlIdentifier = exports.join = exports.literal = exports.value = exports.identifier = exports.raw = exports.query = exports.compile = void 0;
3
4
  const debugFactory = require("debug");
4
5
  const lru_1 = require("@graphile/lru");
5
6
  const debug = debugFactory("pg-sql2");
@@ -58,6 +59,9 @@ function compile(sql) {
58
59
  // string by placeholders. They are eager because they were provided before
59
60
  // compile time.
60
61
  const values = [];
62
+ // If we use the exact same `sql.value` node more than once, we should use
63
+ // the same placeholder for both (for performance and efficiency)
64
+ const valueNodeToPlaceholder = new Map();
61
65
  // When we come accross a symbol in our identifier, we create a unique
62
66
  // alias for it that shouldn’t be in the users schema. This helps maintain
63
67
  // sanity when constructing large Sql queries with many aliases.
@@ -96,15 +100,25 @@ function compile(sql) {
96
100
  sqlFragments.push(nameCount === 1 ? mappedNames[0] : mappedNames.join("."));
97
101
  break;
98
102
  }
99
- case "VALUE":
100
- values.push(item.value);
101
- sqlFragments.push(`$${values.length}`);
103
+ case "VALUE": {
104
+ let placeholder = valueNodeToPlaceholder.get(item);
105
+ // If there's no placeholder for this value node, create one
106
+ if (!placeholder) {
107
+ values.push(item.value);
108
+ placeholder = `$${values.length}`;
109
+ valueNodeToPlaceholder.set(item, placeholder);
110
+ }
111
+ sqlFragments.push(placeholder);
102
112
  break;
113
+ }
103
114
  default:
104
115
  // This cannot happen
105
116
  }
106
117
  }
107
118
  const text = sqlFragments.join("");
119
+ if (values.length > 65535) {
120
+ throw new Error("PostgreSQL allows the use of up to 65535 placeholders; but your statement wants to use ${values.length} placeholders. To solve this issue you could split the statement into multiple statements, or pass more values into a single placeholder by using JSON, arrays, or similar techniques.");
121
+ }
108
122
  return {
109
123
  text,
110
124
  values,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pg-sql2",
3
- "version": "4.7.0",
3
+ "version": "4.11.0",
4
4
  "description": "Generate safe Postgres-compliant SQL with tagged template literals",
5
5
  "main": "node8plus/index.js",
6
6
  "types": "node8plus/index.d.ts",
@@ -32,23 +32,24 @@
32
32
  "bugs": {
33
33
  "url": "https://github.com/graphile/graphile-engine/issues"
34
34
  },
35
- "homepage": "https://github.com/graphile/graphile-build/tree/master/packages/pg-sql2",
35
+ "homepage": "https://github.com/graphile/graphile-engine/tree/master/packages/pg-sql2",
36
36
  "devDependencies": {
37
37
  "@types/debug": "4.1.5",
38
- "@types/node": "12.7.5",
39
- "jest": "24.9.0",
38
+ "@types/node": "14.6.4",
39
+ "jest": "25.x",
40
40
  "markdown-doctest": "^1.0.0",
41
- "ts-jest": "24.1.0",
42
- "ts-node": "8.4.1",
43
- "typescript": "^3.6.3"
41
+ "ts-jest": "25.x",
42
+ "ts-node": "9.0.0",
43
+ "typescript": "^4.0.2"
44
44
  },
45
45
  "peerDependencies": {
46
46
  "pg": ">=6.1.0 <9"
47
47
  },
48
48
  "dependencies": {
49
- "@graphile/lru": "4.5.0",
49
+ "@graphile/lru": "4.11.0",
50
50
  "@types/pg": ">=6 <8",
51
- "debug": ">=3 <5"
51
+ "debug": ">=3 <5",
52
+ "tslib": "^2.0.1"
52
53
  },
53
54
  "files": [
54
55
  "node8plus"
@@ -56,5 +57,5 @@
56
57
  "engines": {
57
58
  "node": ">=8.6"
58
59
  },
59
- "gitHead": "b3d7a1ea967f970936a2dcdd61f94a02dea3b7fe"
60
+ "gitHead": "742133b9064cd64d61e45edc981261a036d56c7f"
60
61
  }