You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/10/27 06:57:44 UTC
[cayenne] branch master updated: CAY-2765 add system catalogs
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new ae0959776 CAY-2765 add system catalogs
new 688c19788 Merge pull request #527 from aperaverzeu/4.3-FEATURE-CAY-2765-add-system-catalogs-for-sqlserver
ae0959776 is described below
commit ae0959776c66a4de9e249e4ef4e4bd7490498442
Author: Aliaskei Peraverzeu <de...@gmail.com>
AuthorDate: Wed Oct 26 13:26:48 2022 +0300
CAY-2765 add system catalogs
---
.../org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
index 401fa1d63..e191bc8da 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java
@@ -85,10 +85,11 @@ public class SQLServerAdapter extends SybaseAdapter {
private final List<String> SYSTEM_SCHEMAS = Arrays.asList(
"db_accessadmin", "db_backupoperator",
"db_datareader", "db_datawriter", "db_ddladmin", "db_denydatareader",
- "db_denydatawriter","dbo", "sys", "db_owner", "db_securityadmin", "guest",
- "INFORMATION_SCHEMA"
+ "db_denydatawriter", "sys", "db_owner", "db_securityadmin", "INFORMATION_SCHEMA"
);
+ private final List<String> SYSTEM_CATALOGS = Arrays.asList("model", "msdb", "tempdb");
+
public SQLServerAdapter(@Inject RuntimeProperties runtimeProperties,
@Inject(Constants.SERVER_DEFAULT_TYPES_LIST) List<ExtendedType> defaultExtendedTypes,
@Inject(Constants.SERVER_USER_TYPES_LIST) List<ExtendedType> userExtendedTypes,
@@ -134,6 +135,11 @@ public class SQLServerAdapter extends SybaseAdapter {
return SYSTEM_SCHEMAS;
}
+ @Override
+ public List<String> getSystemCatalogs() {
+ return SYSTEM_CATALOGS;
+ }
+
public Integer getVersion() {
return version;
}