Skip to content

Commit f186ded

Browse files
authored
Defaults args for CREATE FUNCTION (#7197)
1 parent eab45d1 commit f186ded

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

ydb/library/yql/sql/pg/pg_sql.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5420,10 +5420,17 @@ class TExtensionHandler : public IPGParseEvents {
54205420
}
54215421

54225422
bool hasArgNames = false;
5423+
ui32 defArgsCount = 0;
54235424
for (int i = 0; i < ListLength(value->parameters); ++i) {
54245425
auto node = LIST_CAST_NTH(FunctionParameter, value->parameters, i);
54255426
hasArgNames = hasArgNames || (node->name != nullptr);
54265427
if (node->mode == FUNC_PARAM_IN || node->mode == FUNC_PARAM_DEFAULT) {
5428+
if (node->defexpr) {
5429+
++defArgsCount;
5430+
} else {
5431+
Y_ENSURE(!defArgsCount);
5432+
}
5433+
54275434
desc.InputArgNames.push_back(node->name ? node->name : "");
54285435
} else if (node->mode == FUNC_PARAM_OUT) {
54295436
desc.OutputArgNames.push_back(node->name ? node->name : "");
@@ -5460,6 +5467,17 @@ class TExtensionHandler : public IPGParseEvents {
54605467
}
54615468

54625469
Builder.CreateProc(desc);
5470+
if (defArgsCount) {
5471+
Y_ENSURE(!desc.VariadicType);
5472+
for (ui32 i = 0; i < defArgsCount; ++i) {
5473+
desc.ArgTypes.pop_back();
5474+
if (!desc.InputArgNames.empty()) {
5475+
desc.InputArgNames.pop_back();
5476+
}
5477+
5478+
Builder.CreateProc(desc);
5479+
}
5480+
}
54635481
return true;
54645482
}
54655483

ydb/library/yql/tests/common/test_framework/yqlrun.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ def res_file_path(name):
124124
'PYTHON_COVERAGE_PREFIX',
125125
'NLG_COVERAGE_FILENAME',
126126
'YQL_EXPORT_PG_FUNCTIONS_DIR',
127+
'YQL_ALLOW_ALL_PG_FUNCTIONS',
127128
]:
128129
if var in os.environ:
129130
env[var] = os.environ[var]
@@ -266,6 +267,7 @@ def res_file_path(name):
266267
'PYTHON_COVERAGE_PREFIX',
267268
'NLG_COVERAGE_FILENAME',
268269
'YQL_EXPORT_PG_FUNCTIONS_DIR',
270+
'YQL_ALLOW_ALL_PG_FUNCTIONS',
269271
]:
270272
if var in os.environ:
271273
env[var] = os.environ[var]

0 commit comments

Comments
 (0)