Skip to content

fix(postgres): support select with ordinality #2665

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
nguyenmp wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −5
Open

fix(postgres): support select with ordinality #2665

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
8 changes: 7 additions & 1 deletion ast/postgresql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ export type table_join = table_base & {join: join_op; using: ident_without_kw_ty
on?: on_clause;
};

export type table_base = { type: 'dual' } | { expr: value_clause; as?: alias_clause; } | { prefix?: string; expr: union_stmt | value_clause; as?: alias_clause; } | { prefix?: string; expr: table_ref_list; as?: alias_clause; } | { prefix?: string; type: 'expr'; expr: expr; as?: alias_clause; } | table_name & { expr: expr, repeatable: literal_numeric; as?: alias_clause;} | table_name & { as?: alias_clause; };
export type table_base = { type: 'dual' } | { expr: value_clause; as?: alias_clause; } | { prefix?: string; expr: union_stmt | value_clause; as?: alias_clause; } | { prefix?: string; expr: table_ref_list; as?: alias_clause; } | { prefix?: string; type: 'expr'; expr: expr; ordinality?: boolean; as?: alias_clause; } | table_name & { expr: expr, repeatable: literal_numeric; as?: alias_clause;} | table_name & { as?: alias_clause; };



Expand Down Expand Up @@ -1851,6 +1851,8 @@ type KW_TIMESTAMP_TZ = never;

type KW_TIMESTAMP_NTZ = never;

type KW_TIMESTAMP_LTZ = never;

type KW_YEAR = never;

type KW_GEOMETRY = never;
Expand Down Expand Up @@ -2013,6 +2015,10 @@ type KW_VAR_PRE_DOLLAR_DOUBLE = never;

type KW_VAR_PRE = never;

type KW_VARIANT = never;

type KW_OBJECT = never;

@nguyenmp nguyenmp Jun 6, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a bug on master, master is out of date. Needs to regenerate this file.

type KW_ASSIGN = never;

type KW_ASSIGIN_EQUAL = never;
Expand Down
6 changes: 3 additions & 3 deletions pegjs/postgresql.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3705,9 +3705,9 @@ table_base
as: alias
};
}
/ l:('LATERAL'i)? __ e:func_call __ alias:alias_clause? {
// => { prefix?: string; type: 'expr'; expr: expr; as?: alias_clause; }
return { prefix: l, type: 'expr', expr: e, as: alias };
/ l:('LATERAL'i)? __ e:func_call __ wo:(KW_WITH __ 'ORDINALITY'i)? __ alias:alias_clause? {
// => { prefix?: string; type: 'expr'; expr: expr; ordinality?: boolean; as?: alias_clause; }
return { prefix: l, type: 'expr', expr: e, ordinality: !!wo, as: alias };
}
/ t:table_name __ 'TABLESAMPLE'i __ f:func_call __ re:('REPEATABLE'i __ LPAREN __ literal_numeric __ RPAREN)? __ alias:alias_clause? {
// => table_name & { expr: expr, repeatable: literal_numeric; as?: alias_clause;}
Expand Down
3 changes: 2 additions & 1 deletion src/tables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function generateVirtualTable(stmt) {

function tableToSQL(tableInfo) {
if (toUpper(tableInfo.type) === 'UNNEST') return unnestToSQL(tableInfo)
const { table, db, as, expr, operator, prefix: prefixStr, schema, server, suffix, tablesample, temporal_table, table_hint, surround = {} } = tableInfo
const { table, db, as, expr, operator, ordinality, prefix: prefixStr, schema, server, suffix, tablesample, temporal_table, table_hint, surround = {} } = tableInfo
const serverName = identifierToSql(server, false, surround.server)
const database = identifierToSql(db, false, surround.db)
const schemaStr = identifierToSql(schema, false, surround.schema)
Expand Down Expand Up @@ -147,6 +147,7 @@ function tableToSQL(tableInfo) {
const tableSampleSQL = ['TABLESAMPLE', exprToSQL(tablesample.expr), literalToSQL(tablesample.repeatable)].filter(hasVal).join(' ')
result.push(tableSampleSQL)
}
if (ordinality) result.push('WITH ORDINALITY')
result.push(temporalTableToSQL(temporal_table), commonOptionConnector('AS', typeof as === 'string' ? identifierToSql : exprToSQL, as), operatorToSQL(operator))
if (table_hint) result.push(toUpper(table_hint.keyword), `(${table_hint.expr.map(tableHintToSQL).filter(hasVal).join(', ')})`)
const tableSQL = result.filter(hasVal).join(' ')
Expand Down
7 changes: 7 additions & 0 deletions test/postgres.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,13 @@ describe('Postgres', () => {
'CREATE TABLE "test_table" (id INT NOT NULL, vector TSVECTOR)'
]
},
{
title: 'select from set-returning function WITH ORDINALITY',
sql: [
`SELECT t.v, t.ord FROM unnest(ARRAY[1, 2, 3]) WITH ORDINALITY AS t`,
'SELECT "t".v, "t".ord FROM unnest(ARRAY[1,2,3]) WITH ORDINALITY AS "t"'
]
},
]
function neatlyNestTestedSQL(sqlList){
sqlList.forEach(sqlInfo => {
Expand Down