Skip to content

Support MERGE statement in PostgreSQL #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emirmrkaljevic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support MERGE statement in PostgreSQL #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/languages/postgresql/postgresql.formatter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,15 @@ const reservedClauses = expandPhrases([
'FOR {UPDATE | NO KEY UPDATE | SHARE | KEY SHARE} [OF]',
// Data manipulation
// - insert:
'INSERT INTO',
'INSERT [INTO]',
'VALUES',
'DEFAULT VALUES',
// - update:
'SET',
// - merge:
'MERGE INTO',
'WHEN [NOT] MATCHED [BY SOURCE | BY TARGET] [THEN]',
'UPDATE SET',
// other
'RETURNING',
]);
Expand Down
3 changes: 3 additions & 0 deletions src/languages/postgresql/postgresql.functions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,9 @@ export const functions: string[] = [
// https://www.postgresql.org/docs/14/functions-statistics.html
'PG_MCV_LIST_ITEMS',

// https://www.postgresql.org/docs/17/functions-merge-support.html
'MERGE_ACTION',

// cast
'CAST',
];
28 changes: 28 additions & 0 deletions test/postgresql.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import supportsCreateView from './features/createView.js';
import supportsIsDistinctFrom from './features/isDistinctFrom.js';
import supportsArrayLiterals from './features/arrayLiterals.js';
import supportsDataTypeCase from './options/dataTypeCase.js';
import supportsMergeInto from './features/mergeInto.js';
import behavesLikePostgresqlFormatter from './behavesLikePostgresqlFormatter.js';

describe('PostgreSqlFormatter', () => {
Expand Down Expand Up @@ -147,6 +148,33 @@ describe('PostgreSqlFormatter', () => {
supportsParams(format, { numbered: ['$'] });
supportsLimiting(format, { limit: true, offset: true, fetchFirst: true, fetchNext: true });
supportsDataTypeCase(format);
supportsMergeInto(format);

// Issue #986
it('formats MERGE with PostgreSQL 17 additions', () => {
const result = format(
`MERGE INTO stock t USING incoming s ON t.sku = s.sku
WHEN MATCHED AND s.qty = 0 THEN DELETE
WHEN NOT MATCHED BY SOURCE THEN DO NOTHING
WHEN NOT MATCHED BY TARGET THEN INSERT VALUES (s.sku, s.qty)
RETURNING merge_action(), t.*;`
);
expect(result).toBe(dedent`
MERGE INTO
stock t USING incoming s ON t.sku = s.sku
WHEN MATCHED
AND s.qty = 0 THEN DELETE
WHEN NOT MATCHED BY SOURCE THEN
DO NOTHING
WHEN NOT MATCHED BY TARGET THEN
INSERT
VALUES
(s.sku, s.qty)
RETURNING
merge_action(),
t.*;
`);
});

// Regression test for issue #935
it('preserves pg_dump restrict commands', () => {
Expand Down