GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-08-11 01:03:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(data-grid): handle update clause boundaries

Browse Source
This commit is contained in:
mango
2026-08-07 21:15:59 +08:00
parent 7cb276cc9f
commit 6de2304531
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/utils/sqlFieldDrop.test.ts
View File

@@ -51,6 +51,20 @@ describe('buildSqlFieldDropEdit', () => {
.toBe(populatedInsertSql);
});
it('does not treat update FROM and OUTPUT clauses as SET lists', () => {
const postgresSql = 'UPDATE users SET active = source.active FROM source WHERE users.id = source.user_id';
expect(applyEdit(postgresSql, postgresSql.indexOf(' WHERE'), 'archived_at'))
.toBe('UPDATE users SET active = source.active FROM source archived_at WHERE users.id = source.user_id');
const sqlServerOutputSql = 'UPDATE users SET active = 1 OUTPUT FROM users WHERE users.id = 1';
expect(applyEdit(sqlServerOutputSql, sqlServerOutputSql.indexOf(' FROM'), 'updated_at'))
.toBe('UPDATE users SET active = 1 OUTPUT updated_at FROM users WHERE users.id = 1');
const sqlServerFromSql = 'UPDATE users SET active = 1 FROM users WHERE users.id = 1';
expect(applyEdit(sqlServerFromSql, sqlServerFromSql.indexOf(' WHERE'), 'audit'))
.toBe('UPDATE users SET active = 1 FROM users audit WHERE users.id = 1');
});
it('does not add a comma in predicate contexts', () => {
const sql = 'delete from users where = 1';
expect(applyEdit(sql, sql.indexOf('=') - 1, 'id')).toBe('delete from users where id = 1');

2
frontend/src/utils/sqlFieldDrop.ts
View File

@@ -426,7 +426,7 @@ const buildUpdateSetEdit = (
&& token.end <= rawOffset);
if (!setToken) return null;
const clauseEndToken = tokens.find((token) => token.kind === 'word'
&& ['where', 'returning', 'order', 'limit'].includes(token.value.toLowerCase())
&& ['from', 'output', 'where', 'returning', 'order', 'limit'].includes(token.value.toLowerCase())
&& token.depth === updateToken.depth
&& token.start >= setToken.end);
const clauseEnd = clauseEndToken?.start ?? statement.end;