1
0
mirror of synced 2026-10-23 07:08:55 +03:00

Move the 'Returns a set?' option to the Definition tab in the Function dialog. #9264 (#10565)

Also update the documentation and screenshots to match.
This commit is contained in:
Sanskar Kharya
2026-10-14 12:08:07 +01:00
committed by Dave Page
parent a0b4c09772
commit 5515b54d53
4 changed files with 6 additions and 6 deletions

View File

@@ -39,6 +39,8 @@ Use the fields in the *Definition* tab to define the function:
* Use the drop-down listbox next to *Return type* to select the data type
returned by the function, if any. If *Custom return type?* is enabled this field
will change to an input text field.
* Move the *Returns a set?* switch to indicate if the function returns a set
that includes multiple rows. The default is *No*.
* Use the drop-down listbox next to *Language* to select the implementation
language. The default is *sql*.
* Use the drop-down listbox next to *Depends on extensions* to select the extension that this function
@@ -88,8 +90,6 @@ function:
* *IMMUTABLE* indicates that the function cannot modify the database and
always returns the same result when given the same argument values.
* Move the *Returns a Set?* switch to indicate if the function returns a set
that includes multiple rows. The default is *No*.
* Move the *Strict?* switch to indicate if the function always returns NULL
whenever any of its arguments are NULL. If *Yes*, the function is not executed
when there are NULL arguments; instead a NULL result is assumed

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

@@ -265,6 +265,10 @@ export default class FunctionSchema extends BaseUISchema {
id: 'prorettypename', label: gettext('Return type'), cell: 'string',
type: 'text', group: gettext('Definition'),
mode: ['properties', 'edit'], readonly: obj.isReadonly, visible: obj.isVisible,
},{
id: 'proretset', label: gettext('Returns a set?'), type: 'switch',
disabled: ()=>{return !obj.isNew();}, group: gettext('Definition'),
visible: obj.isVisible, readonly: obj.isReadonly,
},{
id: 'lanname', label: gettext('Language'), cell: 'string', noEmpty: true,
options: this.fieldOptions.getLanguage, type: 'select', group: gettext('Definition'),
@@ -332,10 +336,6 @@ export default class FunctionSchema extends BaseUISchema {
{'label': 'IMMUTABLE', 'value': 'i'},
], disabled: (this.type !== 'procedure') ? obj.inCatalog() : obj.isLessThan95ORNonSPL,
controlProps: {allowClear: false},
},{
id: 'proretset', label: gettext('Returns a set?'), type: 'switch',
disabled: ()=>{return !obj.isNew();}, group: gettext('Options'),
visible: obj.isVisible, readonly: obj.isReadonly,
},{
id: 'proisstrict', label: gettext('Strict?'), type: 'switch',
group: gettext('Options'),