Skip to content

Commit 25ab034

Browse files
author
Artyom Abakumov
committed
Cleanup Constant class
1 parent e7e439e commit 25ab034

2 files changed

Lines changed: 0 additions & 39 deletions

File tree

src/jrd/Constant.epp

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -87,42 +87,6 @@ ScanResult Constant::scan(thread_db* tdbb, ObjectBase::Flag flags)
8787
getPermanent()->setName(QualifiedName(CONST.RDB$CONSTANT_NAME, CONST.RDB$SCHEMA_NAME,
8888
(CONST.RDB$PACKAGE_NAME.NULL ? nullptr : CONST.RDB$PACKAGE_NAME)));
8989

90-
MetaName owner;
91-
TriState ssDefiner;
92-
if (!CONST.RDB$PACKAGE_NAME.NULL)
93-
{
94-
static const CachedRequestId requestId;
95-
AutoCacheRequest requestHandle(tdbb, requestId);
96-
97-
FOR (REQUEST_HANDLE requestHandle)
98-
PKG IN RDB$PACKAGES
99-
CROSS SCH IN RDB$SCHEMAS WITH
100-
PKG.RDB$SCHEMA_NAME EQ CONST.RDB$SCHEMA_NAME AND
101-
PKG.RDB$PACKAGE_NAME EQ CONST.RDB$PACKAGE_NAME
102-
{
103-
104-
owner = PKG.RDB$OWNER_NAME;
105-
106-
// if (!PKG.RDB$SECURITY_CLASS.NULL)
107-
// {
108-
// getPermanent()->setSecurityName(QualifiedName(PKG.RDB$SECURITY_CLASS, SCH.RDB$SECURITY_CLASS));
109-
// }
110-
111-
// SQL SECURITY of function must be the same if it's defined in package
112-
if (!PKG.RDB$SQL_SECURITY.NULL)
113-
ssDefiner = (bool) PKG.RDB$SQL_SECURITY;
114-
}
115-
END_FOR
116-
}
117-
118-
if (!ssDefiner.isAssigned())
119-
{
120-
ssDefiner = MET_get_ss_definer(tdbb, CONST.RDB$SCHEMA_NAME);
121-
}
122-
123-
// if (ssDefiner.asBool())
124-
// invoker = dbb->getUserId(getPermanent()->owner);
125-
12690
if ((flags & CacheFlag::MINISCAN) == 0)
12791
makeValue(tdbb, attachment, CONST.RDB$CONSTANT_BLR);
12892
else

src/jrd/Routine.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@ void Routine::setStatement(Statement* value)
134134
statement->function = static_cast<Function*>(this);
135135
break;
136136

137-
case obj_package_constant:
138-
break;
139-
140137
default:
141138
fb_assert(false);
142139
break;

0 commit comments

Comments
 (0)