hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[to #49080431]fix user_errors view definition

Browse Source
This commit is contained in:
obdev
2023-05-08 13:08:47 +00:00
committed by ob-robot
parent cbaf61bef6
commit cd6d24c0f4
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/inner_table/ob_inner_table_schema.25101_25150.cpp
View File

@ -210,7 +210,7 @@ int ObInnerTableSchema::user_errors_ora_schema(ObTableSchema &table_schema)
table_schema.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
if (OB_SUCC(ret)) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(o.owner AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM SYS.ALL_OBJECTS o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e, SYS.ALL_USERS u WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) AND u.username=o.owner AND u.userid IN (USERENV('SCHEMAID')) )__"))) {
if (OB_FAIL(table_schema.set_view_definition(R"__( SELECT CAST(SYS_CONTEXT('USERENV','CURRENT_USER') AS VARCHAR2(128)) AS OWNER, CAST(o.object_name AS VARCHAR2(128)) AS NAME, CAST(o.object_type AS VARCHAR2(19)) AS TYPE, CAST(e.obj_seq AS NUMBER) AS SEQUENCE, CAST(e.line AS NUMBER) AS LINE, CAST(e.position AS NUMBER) AS POSITION, CAST(e.text as VARCHAR2(4000)) AS TEXT, CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE, CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER FROM SYS.USER_OBJECTS o, (select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type, 3, 'PACKAGE', 4, 'TYPE', 5, 'PACKAGE BODY', 6, 'TYPE BODY', 7, 'TRIGGER', 8, 'VIEW', 9, 'FUNCTION', 12, 'PROCEDURE', 'MAXTYPE')) AS VARCHAR2(23)) object_type from SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e WHERE o.object_id = e.obj_id AND o.object_type like e.object_type AND o.object_type IN (UPPER('package'), UPPER('type'), UPPER('procedure'), UPPER('function'), UPPER('package body'), UPPER('view'), UPPER('trigger'), UPPER('type body'), UPPER('library'), UPPER('queue'), UPPER('java source'), UPPER('java class'), UPPER('dimension'), UPPER('assembly'), UPPER('hierarchy'), UPPER('arrtibute dimension'), UPPER('analytic view')) )__"))) {
LOG_ERROR("fail to set view_definition", K(ret));
}
}

9
src/share/inner_table/ob_inner_table_schema_def.py
View File

@ -37694,7 +37694,7 @@ def_table_schema(
in_tenant_space = True,
view_definition = """
SELECT
CAST(o.owner AS VARCHAR2(128)) AS OWNER,
CAST(SYS_CONTEXT('USERENV','CURRENT_USER') AS VARCHAR2(128)) AS OWNER,
CAST(o.object_name AS VARCHAR2(128)) AS NAME,
CAST(o.object_type AS VARCHAR2(19)) AS TYPE,
CAST(e.obj_seq AS NUMBER) AS SEQUENCE,
@ -37704,7 +37704,7 @@ SELECT
CAST(DECODE(e.property, 0, 'ERROR', 1, 'WARNING', 'UNDEFINED') AS VARCHAR2(9)) AS ATTRIBUTE,
CAST(e.error_number AS NUMBER) AS MESSAGE_NUMBER
FROM
SYS.ALL_OBJECTS o,
SYS.USER_OBJECTS o,
(select obj_id, obj_seq, line, position, text, property, error_number, CAST( UPPER(decode(obj_type,
3, 'PACKAGE',
4, 'TYPE',
@ -37715,8 +37715,7 @@ FROM
9, 'FUNCTION',
12, 'PROCEDURE',
'MAXTYPE')) AS VARCHAR2(23)) object_type from SYS.ALL_VIRTUAL_TENANT_ERROR_REAL_AGENT
WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e,
SYS.ALL_USERS u
WHERE TENANT_ID = EFFECTIVE_TENANT_ID()) e
WHERE
o.object_id = e.obj_id
AND o.object_type like e.object_type
@ -37737,8 +37736,6 @@ WHERE
UPPER('hierarchy'),
UPPER('arrtibute dimension'),
UPPER('analytic view'))
AND u.username=o.owner
AND u.userid IN (USERENV('SCHEMAID'))
""".replace("\n", " ")
)
def_table_schema(