[cayenne] branch STABLE-4.2 updated: CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer

[ntimofeev]

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch STABLE-4.2
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/STABLE-4.2 by this push:
     new 3bda65dd2 CAY-2765 dbimport: check excluded catalogs and schemas for 
the SQLServer
3bda65dd2 is described below

commit 3bda65dd2492c70bde36c09a0388d900331f5b6f
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Wed Oct 26 11:48:03 2022 +0300

    CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
---
 RELEASE-NOTES.txt                                              |  1 +
 .../org/apache/cayenne/dba/sqlserver/SQLServerAdapter.java     | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1b9147a5e..917d40096 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -22,6 +22,7 @@ Bug Fixes:
 
 CAY-2755 Modeler: Entities are not sorted by name in the class generation view
 CAY-2762 Modeler: Difference in toolbars colors on OSX
+CAY-2765 dbimport: check excluded catalogs and schemas for the SQLServer
 
 ----------------------------------
 Release: 4.2.RC1
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 6642e8e5e..0b71a2028 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
@@ -91,10 +91,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,
@@ -135,6 +136,11 @@ public class SQLServerAdapter extends SybaseAdapter {
                return query.createSQLAction(new SQLServerActionBuilder(node, 
getVersion()));
        }
 
+       @Override
+       public List<String> getSystemCatalogs() {
+               return SYSTEM_CATALOGS;
+       }
+
        @Override
        public List<String> getSystemSchemas() {
                return SYSTEM_SCHEMAS;