@agentuity/drizzle 1.0.6 → 1.0.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 (5) hide show
  1. package/dist/postgres.d.ts.map +1 -1
  2. package/dist/postgres.js +96 -0
  3. package/dist/postgres.js.map +1 -1
  4. package/package.json +3 -3
  5. package/src/postgres.ts +111 -0
package/dist/postgres.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAY,KAAK,sBAAsB,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,cAAc,CA0BzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,sBAAsB,GAC5B,YAAY,CAAC,OAAO,MAAM,CAAC,CAqC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAoCnE"}
1
+ {"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAY,KAAK,sBAAsB,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,cAAc,CA0BzD;AA8FD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,sBAAsB,GAC5B,YAAY,CAAC,OAAO,MAAM,CAAC,CAwD7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAoCnE"}
package/dist/postgres.js CHANGED
@@ -32,6 +32,85 @@ export function resolvePostgresClientConfig(config) {
32
32
  }
33
33
  return clientConfig;
34
34
  }
35
+ /**
36
+ * Strips leading whitespace and SQL comments (block and line) from a query string.
37
+ * Returns the remaining query text starting at the first non-comment token.
38
+ */
39
+ const LEADING_COMMENTS_RE = /^(?:\s+|\/\*[\s\S]*?\*\/|--[^\n]*\n)*/;
40
+ /**
41
+ * Determines whether a SQL query is a non-retryable INSERT statement.
42
+ *
43
+ * Handles two patterns:
44
+ * 1. Direct INSERT: `INSERT INTO ...` (with optional leading comments/whitespace)
45
+ * 2. CTE INSERT: `WITH cte AS (...) INSERT INTO ...` — scans past the WITH clause
46
+ * by tracking parenthesis depth to skip CTE subexpressions, then checks
47
+ * if the first top-level DML keyword is INSERT.
48
+ *
49
+ * @see https://github.com/agentuity/sdk/issues/911
50
+ */
51
+ function isNonRetryableInsert(query) {
52
+ // Strip leading whitespace and SQL comments
53
+ const stripped = query.replace(LEADING_COMMENTS_RE, '');
54
+ // Fast path: direct INSERT statement
55
+ if (/^INSERT\s/i.test(stripped)) {
56
+ return true;
57
+ }
58
+ // Check for WITH (CTE) prefix
59
+ if (!/^WITH\s/i.test(stripped)) {
60
+ return false;
61
+ }
62
+ // Scan past the CTE clause to find the first top-level DML keyword.
63
+ // We track parenthesis depth so we skip CTE subexpressions like
64
+ // "WITH cte AS (SELECT ... INSERT ...)" without false-matching the
65
+ // INSERT inside the parens.
66
+ let depth = 0;
67
+ let i = 4; // skip past "WITH"
68
+ const len = stripped.length;
69
+ while (i < len) {
70
+ const ch = stripped[i];
71
+ if (ch === '(') {
72
+ depth++;
73
+ i++;
74
+ continue;
75
+ }
76
+ if (ch === ')') {
77
+ depth--;
78
+ i++;
79
+ continue;
80
+ }
81
+ // Only inspect keywords at top level (depth === 0)
82
+ if (depth === 0) {
83
+ // Skip whitespace at top level
84
+ if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') {
85
+ i++;
86
+ continue;
87
+ }
88
+ // Skip commas between CTEs: WITH a AS (...), b AS (...)
89
+ if (ch === ',') {
90
+ i++;
91
+ continue;
92
+ }
93
+ // Check for DML keywords at this position.
94
+ // We look for INSERT, UPDATE, DELETE, or SELECT — the first one
95
+ // we find at top level determines whether this is retryable.
96
+ const rest = stripped.substring(i);
97
+ const dmlMatch = /^(INSERT|UPDATE|DELETE|SELECT)\s/i.exec(rest);
98
+ if (dmlMatch) {
99
+ return dmlMatch[1].toUpperCase() === 'INSERT';
100
+ }
101
+ // Skip over any other word (e.g., CTE names, AS keyword, RECURSIVE)
102
+ // by advancing past alphanumeric/underscore characters
103
+ if (/\w/.test(ch)) {
104
+ while (i < len && /\w/.test(stripped[i])) {
105
+ i++;
106
+ }
107
+ continue;
108
+ }
109
+ }
110
+ i++;
111
+ }
112
+ return false;
113
+ }
35
114
  /**
36
115
  * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
37
116
  * current raw connection. This ensures that after automatic reconnection,
@@ -54,6 +133,23 @@ export function createResilientSQLProxy(client) {
54
133
  // client.unsafe(query, params) → Promise<rows>
55
134
  // client.unsafe(query, params).values() → Promise<rows>
56
135
  return (query, params) => {
136
+ // INSERT statements (including CTE-based) are NOT retried to prevent
137
+ // duplicate rows. If an INSERT succeeds on the server but the connection
138
+ // drops before the response, retrying would re-execute it — creating a
139
+ // duplicate row when the primary key is server-generated.
140
+ // See: https://github.com/agentuity/sdk/issues/911
141
+ const isInsert = isNonRetryableInsert(query);
142
+ if (isInsert) {
143
+ const makeDirectExecutor = (useValues) => {
144
+ const currentRaw = client.raw;
145
+ const q = currentRaw.unsafe(query, params);
146
+ return useValues ? q.values() : q;
147
+ };
148
+ const result = makeDirectExecutor(false);
149
+ return Object.assign(result, {
150
+ values: () => makeDirectExecutor(true),
151
+ });
152
+ }
57
153
  const makeExecutor = (useValues) => client.executeWithRetry(async () => {
58
154
  // Re-resolve raw inside retry to get post-reconnect instance
59
155
  const currentRaw = client.raw;
package/dist/postgres.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"postgres.js","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"postgres.js","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@agentuity/drizzle",
3
- "version": "1.0.6",
3
+ "version": "1.0.7",
4
4
  "license": "Apache-2.0",
5
5
  "author": "Agentuity employees and contributors",
6
6
  "type": "module",
@@ -41,12 +41,12 @@
41
41
  "prepublishOnly": "bun run clean && bun run build"
42
42
  },
43
43
  "dependencies": {
44
- "@agentuity/postgres": "1.0.6",
44
+ "@agentuity/postgres": "1.0.7",
45
45
  "drizzle-orm": "^0.45.0",
46
46
  "better-auth": "^1.4.9"
47
47
  },
48
48
  "devDependencies": {
49
- "@agentuity/test-utils": "1.0.6",
49
+ "@agentuity/test-utils": "1.0.7",
50
50
  "@types/bun": "latest",
51
51
  "bun-types": "latest",
52
52
  "typescript": "^5.9.0"
package/src/postgres.ts CHANGED
@@ -40,6 +40,98 @@ export function resolvePostgresClientConfig<
40
40
  return clientConfig;
41
41
  }
42
42
 
43
+ /**
44
+ * Strips leading whitespace and SQL comments (block and line) from a query string.
45
+ * Returns the remaining query text starting at the first non-comment token.
46
+ */
47
+ const LEADING_COMMENTS_RE = /^(?:\s+|\/\*[\s\S]*?\*\/|--[^\n]*\n)*/;
48
+
49
+ /**
50
+ * Determines whether a SQL query is a non-retryable INSERT statement.
51
+ *
52
+ * Handles two patterns:
53
+ * 1. Direct INSERT: `INSERT INTO ...` (with optional leading comments/whitespace)
54
+ * 2. CTE INSERT: `WITH cte AS (...) INSERT INTO ...` — scans past the WITH clause
55
+ * by tracking parenthesis depth to skip CTE subexpressions, then checks
56
+ * if the first top-level DML keyword is INSERT.
57
+ *
58
+ * @see https://github.com/agentuity/sdk/issues/911
59
+ */
60
+ function isNonRetryableInsert(query: string): boolean {
61
+ // Strip leading whitespace and SQL comments
62
+ const stripped = query.replace(LEADING_COMMENTS_RE, '');
63
+
64
+ // Fast path: direct INSERT statement
65
+ if (/^INSERT\s/i.test(stripped)) {
66
+ return true;
67
+ }
68
+
69
+ // Check for WITH (CTE) prefix
70
+ if (!/^WITH\s/i.test(stripped)) {
71
+ return false;
72
+ }
73
+
74
+ // Scan past the CTE clause to find the first top-level DML keyword.
75
+ // We track parenthesis depth so we skip CTE subexpressions like
76
+ // "WITH cte AS (SELECT ... INSERT ...)" without false-matching the
77
+ // INSERT inside the parens.
78
+ let depth = 0;
79
+ let i = 4; // skip past "WITH"
80
+ const len = stripped.length;
81
+
82
+ while (i < len) {
83
+ const ch = stripped[i]!;
84
+
85
+ if (ch === '(') {
86
+ depth++;
87
+ i++;
88
+ continue;
89
+ }
90
+ if (ch === ')') {
91
+ depth--;
92
+ i++;
93
+ continue;
94
+ }
95
+
96
+ // Only inspect keywords at top level (depth === 0)
97
+ if (depth === 0) {
98
+ // Skip whitespace at top level
99
+ if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') {
100
+ i++;
101
+ continue;
102
+ }
103
+
104
+ // Skip commas between CTEs: WITH a AS (...), b AS (...)
105
+ if (ch === ',') {
106
+ i++;
107
+ continue;
108
+ }
109
+
110
+ // Check for DML keywords at this position.
111
+ // We look for INSERT, UPDATE, DELETE, or SELECT — the first one
112
+ // we find at top level determines whether this is retryable.
113
+ const rest = stripped.substring(i);
114
+ const dmlMatch = /^(INSERT|UPDATE|DELETE|SELECT)\s/i.exec(rest);
115
+ if (dmlMatch) {
116
+ return dmlMatch[1]!.toUpperCase() === 'INSERT';
117
+ }
118
+
119
+ // Skip over any other word (e.g., CTE names, AS keyword, RECURSIVE)
120
+ // by advancing past alphanumeric/underscore characters
121
+ if (/\w/.test(ch)) {
122
+ while (i < len && /\w/.test(stripped[i]!)) {
123
+ i++;
124
+ }
125
+ continue;
126
+ }
127
+ }
128
+
129
+ i++;
130
+ }
131
+
132
+ return false;
133
+ }
134
+
43
135
  /**
44
136
  * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
45
137
  * current raw connection. This ensures that after automatic reconnection,
@@ -65,6 +157,25 @@ export function createResilientSQLProxy(
65
157
  // client.unsafe(query, params) → Promise<rows>
66
158
  // client.unsafe(query, params).values() → Promise<rows>
67
159
  return (query: string, params?: unknown[]) => {
160
+ // INSERT statements (including CTE-based) are NOT retried to prevent
161
+ // duplicate rows. If an INSERT succeeds on the server but the connection
162
+ // drops before the response, retrying would re-execute it — creating a
163
+ // duplicate row when the primary key is server-generated.
164
+ // See: https://github.com/agentuity/sdk/issues/911
165
+ const isInsert = isNonRetryableInsert(query);
166
+
167
+ if (isInsert) {
168
+ const makeDirectExecutor = (useValues: boolean) => {
169
+ const currentRaw = client.raw;
170
+ const q = currentRaw.unsafe(query, params);
171
+ return useValues ? q.values() : q;
172
+ };
173
+ const result = makeDirectExecutor(false);
174
+ return Object.assign(result, {
175
+ values: () => makeDirectExecutor(true),
176
+ });
177
+ }
178
+
68
179
  const makeExecutor = (useValues: boolean) =>
69
180
  client.executeWithRetry(async () => {
70
181
  // Re-resolve raw inside retry to get post-reconnect instance