Skip to content

Commit 7a4f958

Browse files
PostgreSQL: Support WINDOW in CREATE FUNCTION (#2826)
1 parent b40bf4b commit 7a4f958

6 files changed

Lines changed: 53 additions & 2 deletions

File tree

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CREATE FUNCTION public.f(x integer) RETURNS SETOF integer
2-
LANGUAGE sql
2+
LANGUAGE c
3+
WINDOW
34
IMMUTABLE STRICT NOT LEAKPROOF
45
COST 2.5 ROWS 10 SUPPORT public.f_support
5-
AS 'SELECT x'
6+
AS 'obj', 'sym'

‎src/ast/ddl.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3931,6 +3931,10 @@ pub struct CreateFunction {
39313931
///
39323932
/// [PostgreSQL](https://www.postgresql.org/docs/current/sql-createfunction.html)
39333933
pub leakproof: Option<bool>,
3934+
/// `WINDOW`
3935+
///
3936+
/// [PostgreSQL](https://www.postgresql.org/docs/current/sql-createfunction.html)
3937+
pub window: bool,
39343938
/// `COST execution_cost`
39353939
///
39363940
/// [PostgreSQL](https://www.postgresql.org/docs/current/sql-createfunction.html)
@@ -4004,6 +4008,9 @@ impl fmt::Display for CreateFunction {
40044008
if let Some(language) = &self.language {
40054009
write!(f, " LANGUAGE {language}")?;
40064010
}
4011+
if self.window {
4012+
write!(f, " WINDOW")?;
4013+
}
40074014
if let Some(behavior) = &self.behavior {
40084015
write!(f, " {behavior}")?;
40094016
}

‎src/parser/mod.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6140,6 +6140,7 @@ impl<'a> Parser<'a> {
61406140
parallel: Option<FunctionParallel>,
61416141
security: Option<FunctionSecurity>,
61426142
leakproof: Option<bool>,
6143+
window: Option<()>,
61436144
cost: Option<Expr>,
61446145
rows: Option<Expr>,
61456146
support: Option<ObjectName>,
@@ -6217,6 +6218,9 @@ impl<'a> Parser<'a> {
62176218
} else if self.parse_keywords(&[Keyword::NOT, Keyword::LEAKPROOF]) {
62186219
ensure_not_set(&body.leakproof, "[NOT] LEAKPROOF")?;
62196220
body.leakproof = Some(false);
6221+
} else if self.parse_keyword(Keyword::WINDOW) {
6222+
ensure_not_set(&body.window, "WINDOW")?;
6223+
body.window = Some(());
62206224
} else if self.parse_keyword(Keyword::COST) {
62216225
ensure_not_set(&body.cost, "COST")?;
62226226
body.cost = Some(self.parse_number()?);
@@ -6265,6 +6269,7 @@ impl<'a> Parser<'a> {
62656269
parallel: body.parallel,
62666270
security: body.security,
62676271
leakproof: body.leakproof,
6272+
window: body.window.is_some(),
62686273
cost: body.cost,
62696274
rows: body.rows,
62706275
support: body.support,
@@ -6308,6 +6313,7 @@ impl<'a> Parser<'a> {
63086313
parallel: None,
63096314
security: None,
63106315
leakproof: None,
6316+
window: false,
63116317
cost: None,
63126318
rows: None,
63136319
support: None,
@@ -6396,6 +6402,7 @@ impl<'a> Parser<'a> {
63966402
parallel: None,
63976403
security: None,
63986404
leakproof: None,
6405+
window: false,
63996406
cost: None,
64006407
rows: None,
64016408
support: None,
@@ -6491,6 +6498,7 @@ impl<'a> Parser<'a> {
64916498
parallel: None,
64926499
security: None,
64936500
leakproof: None,
6501+
window: false,
64946502
cost: None,
64956503
rows: None,
64966504
support: None,

‎tests/sqlparser_bigquery.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,6 +2354,7 @@ fn test_bigquery_create_function() {
23542354
parallel: None,
23552355
security: None,
23562356
leakproof: None,
2357+
window: false,
23572358
cost: None,
23582359
rows: None,
23592360
support: None,

‎tests/sqlparser_mssql.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ fn parse_create_function() {
277277
parallel: None,
278278
security: None,
279279
leakproof: None,
280+
window: false,
280281
cost: None,
281282
rows: None,
282283
support: None,
@@ -456,6 +457,7 @@ fn parse_create_function_parameter_default_values() {
456457
parallel: None,
457458
security: None,
458459
leakproof: None,
460+
window: false,
459461
cost: None,
460462
rows: None,
461463
support: None,

‎tests/sqlparser_postgres.rs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5498,6 +5498,7 @@ $$"#;
54985498
parallel: None,
54995499
security: None,
55005500
leakproof: None,
5501+
window: false,
55015502
cost: None,
55025503
rows: None,
55035504
support: None,
@@ -5545,6 +5546,7 @@ $$"#;
55455546
parallel: None,
55465547
security: None,
55475548
leakproof: None,
5549+
window: false,
55485550
cost: None,
55495551
rows: None,
55505552
support: None,
@@ -5596,6 +5598,7 @@ $$"#;
55965598
parallel: None,
55975599
security: None,
55985600
leakproof: None,
5601+
window: false,
55995602
cost: None,
56005603
rows: None,
56015604
support: None,
@@ -5647,6 +5650,7 @@ $$"#;
56475650
parallel: None,
56485651
security: None,
56495652
leakproof: None,
5653+
window: false,
56505654
cost: None,
56515655
rows: None,
56525656
support: None,
@@ -5691,6 +5695,7 @@ $$"#;
56915695
parallel: None,
56925696
security: None,
56935697
leakproof: None,
5698+
window: false,
56945699
cost: None,
56955700
rows: None,
56965701
support: None,
@@ -5741,6 +5746,7 @@ fn parse_create_function() {
57415746
parallel: Some(FunctionParallel::Safe),
57425747
security: None,
57435748
leakproof: None,
5749+
window: false,
57445750
cost: None,
57455751
rows: None,
57465752
support: None,
@@ -5887,6 +5893,7 @@ fn parse_create_function_c_with_module_pathname() {
58875893
parallel: Some(FunctionParallel::Safe),
58885894
security: None,
58895895
leakproof: None,
5896+
window: false,
58905897
cost: None,
58915898
rows: None,
58925899
support: None,
@@ -7738,6 +7745,7 @@ fn parse_trigger_related_functions() {
77387745
parallel: None,
77397746
security: None,
77407747
leakproof: None,
7748+
window: false,
77417749
cost: None,
77427750
rows: None,
77437751
support: None,
@@ -13354,3 +13362,27 @@ fn parse_create_function_leakproof() {
1335413362
);
1335513363
}
1335613364
}
13365+
13366+
#[test]
13367+
fn parse_create_function_window() {
13368+
let stmt = pg_and_generic().verified_stmt(
13369+
"CREATE FUNCTION f(INT) RETURNS INT LANGUAGE c WINDOW IMMUTABLE AS 'obj', 'f'",
13370+
);
13371+
assert_display_propagates_write_errors(&stmt, &[" WINDOW"]);
13372+
let Statement::CreateFunction(create) = stmt else {
13373+
unreachable!()
13374+
};
13375+
assert!(create.window);
13376+
13377+
pg_and_generic().one_statement_parses_to(
13378+
"CREATE FUNCTION f(INT) RETURNS INT IMMUTABLE WINDOW AS 'obj', 'f'",
13379+
"CREATE FUNCTION f(INT) RETURNS INT WINDOW IMMUTABLE AS 'obj', 'f'",
13380+
);
13381+
13382+
assert_eq!(
13383+
pg().parse_sql_statements("CREATE FUNCTION f() RETURNS INT WINDOW WINDOW AS 'obj', 'f'")
13384+
.unwrap_err()
13385+
.to_string(),
13386+
"sql parser error: WINDOW specified more than once"
13387+
);
13388+
}

0 commit comments

Comments
 (0)