Skip to content

Commit e392484

Browse files
committed
Fixes to RDB$SQL package.
1 parent 7d13f3f commit e392484

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

doc/sql.extensions/README.sql_package.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ Output parameters:
1919
- `LEVEL` type `INTEGER NOT NULL` - indentation level (may have gaps in relation to parent's level)
2020
- `PACKAGE_NAME` type `RDB$PACKAGE_NAME` - package name of a stored procedure
2121
- `OBJECT_NAME` type `RDB$RELATION_NAME` - object (table, procedure) name
22-
- `ALIAS` type `RDB$RELATION_NAME` - alias name
22+
- `ALIAS` type `RDB$SHORT_DESCRIPTION` - alias name
2323
- `RECORD_LENGTH` type `INTEGER` - record length for the record source
2424
- `KEY_LENGTH` type `INTEGER` - key length for the record source
25-
- `ACCESS_PATH` type `VARCHAR(255) CHARACTER SET UTF8 NOT NULL` - friendly plan description
25+
- `ACCESS_PATH` type `RDB$DESCRIPTION NOT NULL` - friendly plan description
2626

2727
```
2828
select *
29-
from rdb$sql.explain('select * from employees where id = ?');
29+
from rdb$sql.explain('select * from employee where emp_no = ?');
3030
```
3131

3232
```
3333
select *
3434
from rdb$sql.explain(q'{
3535
select *
3636
from (
37-
select name from employees
37+
select full_name name from employee
3838
union all
39-
select name from customers
39+
select customer name from customer
4040
)
4141
where name = ?
4242
}');

src/jrd/sys-packages/SqlPackage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ SqlPackage::SqlPackage(MemoryPool& pool)
184184
{"PARENT_RECORD_SOURCE_ID", fld_gen_val, true},
185185
{"LEVEL", fld_integer, false},
186186
{"OBJECT_TYPE", fld_obj_type, true},
187-
{"PACKAGE_NAME", fld_r_name, true},
187+
{"PACKAGE_NAME", fld_pkg_name, true},
188188
{"OBJECT_NAME", fld_r_name, true},
189-
{"ALIAS", fld_r_name, true},
189+
{"ALIAS", fld_short_description, true},
190190
{"CARDINALITY", fld_statistics, true},
191191
{"RECORD_LENGTH", fld_integer, true},
192192
{"KEY_LENGTH", fld_integer, true},

src/jrd/sys-packages/SqlPackage.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class SqlPackage final : public SystemPackage
5252
(FB_SMALLINT, objectType)
5353
(FB_INTL_VARCHAR(METADATA_IDENTIFIER_CHAR_LEN * METADATA_BYTES_PER_CHAR, CS_METADATA), packageName)
5454
(FB_INTL_VARCHAR(METADATA_IDENTIFIER_CHAR_LEN * METADATA_BYTES_PER_CHAR, CS_METADATA), objectName)
55-
(FB_INTL_VARCHAR(METADATA_IDENTIFIER_CHAR_LEN * METADATA_BYTES_PER_CHAR, CS_METADATA), alias)
55+
(FB_INTL_VARCHAR(255 * METADATA_BYTES_PER_CHAR, CS_METADATA), alias)
5656
(FB_DOUBLE, cardinality)
5757
(FB_INTEGER, recordLength)
5858
(FB_INTEGER, keyLength)

0 commit comments

Comments
 (0)