Skip to content

Commit

Permalink
fixed system cluster informations, issue #7182
Browse files Browse the repository at this point in the history
  • Loading branch information
tglman committed Mar 28, 2017
1 parent cd9cd3b commit c7f6bbd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@

import com.orientechnologies.orient.core.cache.OCommandCache;
import com.orientechnologies.orient.core.index.OIndexManagerProxy;
import com.orientechnologies.orient.core.metadata.function.OFunction;
import com.orientechnologies.orient.core.metadata.function.OFunctionLibrary;
import com.orientechnologies.orient.core.metadata.schema.OSchema;
import com.orientechnologies.orient.core.metadata.security.OIdentity;
import com.orientechnologies.orient.core.metadata.security.ORole;
import com.orientechnologies.orient.core.metadata.security.OSecurity;
import com.orientechnologies.orient.core.metadata.security.OUser;
import com.orientechnologies.orient.core.metadata.sequence.OSequence;
import com.orientechnologies.orient.core.metadata.sequence.OSequenceLibrary;
import com.orientechnologies.orient.core.schedule.OScheduler;

Expand All @@ -38,10 +40,10 @@
*
*/
public interface OMetadata {
Set<String> SYSTEM_CLUSTER = Collections.unmodifiableSet(
new HashSet<String>(Arrays.asList(new String[] { OUser.CLASS_NAME.toLowerCase(), ORole.CLASS_NAME.toLowerCase(),
OIdentity.CLASS_NAME.toLowerCase(), "ORIDs".toLowerCase(), OSecurity.RESTRICTED_CLASSNAME.toLowerCase(),
"OFunction".toLowerCase(), "OTriggered".toLowerCase(), "OSchedule".toLowerCase() })));
Set<String> SYSTEM_CLUSTER = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
new String[] { OUser.CLASS_NAME.toLowerCase(), ORole.CLASS_NAME.toLowerCase(), OIdentity.CLASS_NAME.toLowerCase(),
OSecurity.RESTRICTED_CLASSNAME.toLowerCase(), OFunction.CLASS_NAME.toLowerCase(), "OTriggered".toLowerCase(),
"OSchedule".toLowerCase(), "internal"})));

void load();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ public ResultSet getTables(String catalog, String schemaPattern, String tableNam
final String className = cls.getName();
final String type;

if (OMetadata.SYSTEM_CLUSTER.contains(cls.getName()))
if (OMetadata.SYSTEM_CLUSTER.contains(cls.getName().toLowerCase()))
type = "SYSTEM TABLE";
else
type = "TABLE";
Expand Down

0 comments on commit c7f6bbd

Please sign in to comment.