diff --git a/examples/gradle_multi_schema/build.gradle b/examples/gradle_multi_schema/build.gradle new file mode 100644 index 00000000..9a3b47d7 --- /dev/null +++ b/examples/gradle_multi_schema/build.gradle @@ -0,0 +1,25 @@ +buildscript { + repositories { + mavenLocal() + mavenCentral() + } + dependencies { + classpath group: 'com.opitzconsulting.orcas', name: 'orcas-gradle-plugin', + version: '5.8.5' + + classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' + } +} + +apply plugin: 'com.opitzconsulting.orcas.orcas-gradle-plugin' + +orcasconfiguration { + jdbcurl = "jdbc:oracle:thin:@localhost:1521:XE" + username = "orcas_dba" + password = "orcas_dba" + loglevel = "info" + multischema = true + multischemadbaviews = true + multischemaexcludewhereowner = "owner not in ('ORCAS_ORDERENTRY_META','ORCAS_ORDERENTRY_DATA')" +} + diff --git a/examples/gradle_multi_schema/gradle/wrapper/gradle-wrapper.jar b/examples/gradle_multi_schema/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..b1eab5ca Binary files /dev/null and b/examples/gradle_multi_schema/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/gradle_multi_schema/gradle/wrapper/gradle-wrapper.properties b/examples/gradle_multi_schema/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2da79008 --- /dev/null +++ b/examples/gradle_multi_schema/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Feb 24 10:44:42 CET 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip diff --git a/examples/gradle_multi_schema/gradlew b/examples/gradle_multi_schema/gradlew new file mode 100644 index 00000000..4453ccea --- /dev/null +++ b/examples/gradle_multi_schema/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/examples/gradle_multi_schema/gradlew.bat b/examples/gradle_multi_schema/gradlew.bat new file mode 100644 index 00000000..f9553162 --- /dev/null +++ b/examples/gradle_multi_schema/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/gradle_multi_schema/src/main/sql/statics/sequences/sequenzen.sql b/examples/gradle_multi_schema/src/main/sql/statics/sequences/sequenzen.sql new file mode 100644 index 00000000..a1abbe51 --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/sequences/sequenzen.sql @@ -0,0 +1,12 @@ +create sequence orcas_orderentry_meta.bpar_id_seq; + +create sequence orcas_orderentry_meta.ctgr_id_seq; + +create sequence orcas_orderentry_meta.item_id_seq; + +create sequence orcas_orderentry_data.ordr_id_seq; + +create sequence orcas_orderentry_data.orit_id_seq; + +create sequence orcas_orderentry_data.tracking_number_seq; + diff --git a/examples/gradle_multi_schema/src/main/sql/statics/tables/business_partners.sql b/examples/gradle_multi_schema/src/main/sql/statics/tables/business_partners.sql new file mode 100644 index 00000000..6d500430 --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/tables/business_partners.sql @@ -0,0 +1,25 @@ +create table orcas_orderentry_meta.business_partners +( + bpar_id number(15) not null, + version number(15) default "0" not null, + TYPE varchar2(10) not null, + street varchar2(50) not null, + city varchar2(30) not null, + state varchar2(2), + zipcode varchar2(10) not null, + country varchar2(2) not null, + email varchar2(40) not null, + firstname varchar2(30), + lastname varchar2(30), + username varchar2(15), + password varchar2(15), + status varchar2(8), + name varchar2(30), + website varchar2(40), + + constraint bpar_pk primary key (bpar_id), + constraint bpar_uc_name unique (name), + constraint bpar_uc_username unique (username) +); + + diff --git a/examples/gradle_multi_schema/src/main/sql/statics/tables/categories.sql b/examples/gradle_multi_schema/src/main/sql/statics/tables/categories.sql new file mode 100644 index 00000000..af04aa1d --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/tables/categories.sql @@ -0,0 +1,16 @@ +create table orcas_orderentry_meta.categories +( + ctgr_id number(15) not null, + version number(15) default "0" not null, + name varchar2(30) not null, + description varchar2(1000) not null, + + constraint ctgr_pk primary key (ctgr_id), + constraint ctgr_uc unique (name), + + comment on column version is 'default ist null'; + comment on table is 'categories tabelle'; +); + + + diff --git a/examples/gradle_multi_schema/src/main/sql/statics/tables/items.sql b/examples/gradle_multi_schema/src/main/sql/statics/tables/items.sql new file mode 100644 index 00000000..24e871fa --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/tables/items.sql @@ -0,0 +1,18 @@ +create table orcas_orderentry_meta.items +( + item_id number(15) not null, + version number(15) default "0" not null, + ctgr_id number(15) not null, + name varchar2(30) not null, + description varchar2(1000) not null, + image_location varchar2(255), + price number(8,2) not null, + + constraint item_pk primary key (item_id), + constraint item_uc unique (name), + constraint item_ctgr_fk foreign key (ctgr_id) references orcas_orderentry_meta.categories (ctgr_id), + + comment on column version is 'default ist null'; + comment on table is 'items tabelle'; +); + diff --git a/examples/gradle_multi_schema/src/main/sql/statics/tables/items_suppliers.sql b/examples/gradle_multi_schema/src/main/sql/statics/tables/items_suppliers.sql new file mode 100644 index 00000000..0f02db3b --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/tables/items_suppliers.sql @@ -0,0 +1,10 @@ +create table orcas_orderentry_data.items_suppliers +( + item_id number(15) not null, + bpar_id number(15) not null, + + constraint itsu_pk primary key (item_id, bpar_id), + constraint itsu_bpar_fk foreign key (bpar_id) references orcas_orderentry_meta.business_partners (bpar_id), + constraint itsu_item_fk foreign key (item_id) references orcas_orderentry_meta.items (item_id) +); + diff --git a/examples/gradle_multi_schema/src/main/sql/statics/tables/order_items.sql b/examples/gradle_multi_schema/src/main/sql/statics/tables/order_items.sql new file mode 100644 index 00000000..93fbb29b --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/tables/order_items.sql @@ -0,0 +1,20 @@ +create table orcas_orderentry_data.order_items +( + orit_id number(15) not null, + version number(15) default "0" not null, + ordr_id number(15) not null, + item_id number(15) not null, + price number(8,2) not null, + quantity number(4) not null, + + constraint orit_pk primary key (orit_id), + constraint orit_uc unique (ordr_id, item_id), + constraint orit_item_fk foreign key (item_id) references orcas_orderentry_meta.items (item_id), + constraint orit_ordr_fk foreign key (ordr_id) references orcas_orderentry_data.orders (ordr_id) on delete cascade +); + + + + + + diff --git a/examples/gradle_multi_schema/src/main/sql/statics/tables/orders.sql b/examples/gradle_multi_schema/src/main/sql/statics/tables/orders.sql new file mode 100644 index 00000000..e80342c8 --- /dev/null +++ b/examples/gradle_multi_schema/src/main/sql/statics/tables/orders.sql @@ -0,0 +1,22 @@ +create table orcas_orderentry_data.orders +( + ordr_id number(15) not null, + version number(15) default "0" not null, + bpar_id number(15) not null, + orderdate date not null, + tracking_number varchar2(20) not null, + status varchar2(10) not null, + shipping_street varchar2(50) not null, + shipping_city varchar2(30) not null, + shipping_state varchar2(2), + shipping_zipcode varchar2(10) not null, + shipping_country varchar2(2) not null, + + constraint ordr_pk primary key (ordr_id), + constraint ordr_uc unique (tracking_number), + constraint ordr_bpar_fk foreign key (bpar_id) references orcas_orderentry_meta.business_partners (bpar_id) +); + + + + diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/BaseMultiSchemaConnectionManager.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/BaseMultiSchemaConnectionManager.java new file mode 100644 index 00000000..c07197b5 --- /dev/null +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/BaseMultiSchemaConnectionManager.java @@ -0,0 +1,48 @@ +package de.opitzconsulting.orcas.diff; + +import java.util.HashMap; +import java.util.Map; + +import de.opitzconsulting.orcas.diff.JdbcConnectionHandler.CallableStatementProviderImpl; +import de.opitzconsulting.orcas.diff.Parameters.JdbcConnectParameters; +import de.opitzconsulting.orcas.sql.CallableStatementProvider; + +public abstract class BaseMultiSchemaConnectionManager implements MultiSchemaConnectionManager { + private Map connections = new HashMap<>(); + private Parameters parameters; + private boolean keepMultipleConnectionsOpen = true; + + public void setKeepMultipleConnectionsOpen(boolean pKeepMultipleConnectionsOpen) { + keepMultipleConnectionsOpen = pKeepMultipleConnectionsOpen; + } + + void setParameters(Parameters pParameters) { + parameters = pParameters; + } + + @Override + public void releaseAllConnections() { + connections.values().forEach(CallableStatementProviderImpl::close); + connections.clear(); + } + + protected CallableStatementProviderImpl createCallableStatementProvider(JdbcConnectParameters pJdbcConnectParameters) { + return JdbcConnectionHandler.createCallableStatementProvider(parameters, pJdbcConnectParameters); + } + + protected abstract JdbcConnectParameters getJdbcConnectParametersForSchema(String pSchemaName, Parameters pParameters); + + @Override + public CallableStatementProvider getCallableStatementProviderForSchema( + CallableStatementProvider pCallableStatementProviderDefault, String pSchemaName, Parameters pParameters) { + if (connections.containsKey(pSchemaName)) { + return connections.get(pSchemaName); + } else { + if (!keepMultipleConnectionsOpen) { + releaseAllConnections(); + } + connections.put(pSchemaName, createCallableStatementProvider(getJdbcConnectParametersForSchema(pSchemaName, pParameters))); + return connections.get(pSchemaName); + } + } +} diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DdlBuilder.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DdlBuilder.java index b3639f0f..a462a3b6 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DdlBuilder.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DdlBuilder.java @@ -1754,7 +1754,14 @@ private String createForeignKeyClause( ForeignKeyDiff pForeignKeyDiff ) return lReturn; } - public void createForeignKey( StatementBuilder p, TableDiff pTableDiff, ForeignKeyDiff pForeignKeyDiff, boolean pIsMultiSchema, DataHandler pDataHandler ) + public void createForeignKeyGrantIfNeeded( StatementBuilder p, TableDiff pTableDiff, ForeignKeyDiff pForeignKeyDiff ){ + if( !getSchemaName( pTableDiff.nameNew ).equals( getSchemaName( pForeignKeyDiff.destTableNew ) ) ) + { + p.addStmt( "grant references on " + pForeignKeyDiff.destTableNew + " to " + getSchemaName( pTableDiff.nameNew ) ); + } + } + + public void createForeignKey( StatementBuilder p, TableDiff pTableDiff, ForeignKeyDiff pForeignKeyDiff, DataHandler pDataHandler ) { String lFkFalseDataSelect; String lFkFalseDataWherePart; @@ -1800,14 +1807,6 @@ public void createForeignKey( StatementBuilder p, TableDiff pTableDiff, ForeignK } } - if( pIsMultiSchema ) - { - if( !getSchemaName( pTableDiff.nameNew ).equals( getSchemaName( pForeignKeyDiff.destTableNew ) ) ) - { - p.addStmt( "grant references on " + pForeignKeyDiff.destTableNew + " to " + getSchemaName( pTableDiff.nameNew ) ); - } - } - p.stmtStartAlterTable( pTableDiff ); p.stmtAppend( "add" ); p.stmtAppend( createForeignKeyClause( pForeignKeyDiff ) ); diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DiffReasonKey.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DiffReasonKey.java index 9fa781b3..75db0082 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DiffReasonKey.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/DiffReasonKey.java @@ -1,5 +1,6 @@ package de.opitzconsulting.orcas.diff; +import java.rmi.Naming; import java.util.HashMap; import java.util.Map; @@ -19,6 +20,7 @@ public class DiffReasonKey { + private String schemaName; private DiffReasonEntity diffReasonEntity; private String name; private DiffReasonSubEntity diffReasonSubEntity; @@ -44,12 +46,22 @@ private DiffReasonKey( DiffReasonEntity pDiffReasonEntity, String pName ) { diffReasonEntity = pDiffReasonEntity; name = pName; + + int lIndexOfDot = name.indexOf('.'); + if(lIndexOfDot>0){ + schemaName = name.substring(0,lIndexOfDot); + name = name.substring(lIndexOfDot+1); + } } private DiffReasonKey( DiffReasonKey pDiffReasonKey, DiffReasonSubEntity pDiffReasonSubEntity, String pSubName ) { this( pDiffReasonKey.diffReasonEntity, pDiffReasonKey.name ); + if( pDiffReasonKey.schemaName != null ){ + schemaName = pDiffReasonKey.schemaName; + } + diffReasonSubEntity = pDiffReasonSubEntity; subName = pSubName; } @@ -64,6 +76,11 @@ private DiffReasonKey( TableDiff pTableDiff ) this( DiffReasonEntity.TABLE, pTableDiff.isNew ? pTableDiff.nameNew : pTableDiff.nameOld ); } + public DiffReasonKey( String pTableName ) + { + this( DiffReasonEntity.TABLE, pTableName ); + } + private DiffReasonKey( MviewDiff pMviewDiff ) { this( DiffReasonEntity.TABLE, pMviewDiff.isNew ? pMviewDiff.mview_nameNew : pMviewDiff.mview_nameOld ); @@ -131,6 +148,11 @@ public String getTextObjectName() return name; } + public String getTextSchemaName() + { + return schemaName; + } + public String getTextSubobjectName() { return subName; diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/JdbcConnectionHandler.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/JdbcConnectionHandler.java index bf8c7f8a..3546396f 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/JdbcConnectionHandler.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/JdbcConnectionHandler.java @@ -1,6 +1,7 @@ package de.opitzconsulting.orcas.diff; import java.io.ByteArrayOutputStream; +import java.io.Closeable; import java.io.IOException; import java.io.PrintStream; import java.io.Writer; @@ -12,164 +13,168 @@ import java.sql.Struct; import java.util.Properties; +import de.opitzconsulting.orcas.diff.Parameters.JdbcConnectParameters; import de.opitzconsulting.orcas.sql.CallableStatementProvider; import de.opitzconsulting.orcas.sql.JdbcCallableStatementProvider; import de.opitzconsulting.orcas.sql.oracle.OracleDriverSpecificHandler; -public class JdbcConnectionHandler -{ - private static class CallableStatementProviderImpl extends JdbcCallableStatementProvider - { - private Connection _connection; - private Parameters _parameters; +public class JdbcConnectionHandler { + public static class CallableStatementProviderImpl extends JdbcCallableStatementProvider implements Closeable { + private Connection _connection; + private Parameters _parameters; + private String _proxyUser; - public CallableStatementProviderImpl( Connection pConnection, Parameters pParameters ) - { - super( pConnection ); + private CallableStatementProviderImpl(Connection pConnection, Parameters pParameters, String pProxyUser) { + super(pConnection); - _connection = pConnection; - _parameters = pParameters; - } - } - - public interface RunWithCallableStatementProvider - { - void run( CallableStatementProvider pCallableStatementProvider ) throws Exception; - } - - public static void runWithCallableStatementProvider( Parameters pParameters, RunWithCallableStatementProvider pRunWithCallableStatementProvider ) throws Exception - { - runWithCallableStatementProvider( pParameters, pParameters.getJdbcConnectParameters(), pRunWithCallableStatementProvider ); - } - - public static void runWithCallableStatementProvider( Parameters pParameters, Parameters.JdbcConnectParameters pJdbcConnectParameters, RunWithCallableStatementProvider pRunWithCallableStatementProvider ) throws Exception - { - try - { - boolean lIsDriverSet = pJdbcConnectParameters.getJdbcDriver() != null && !pJdbcConnectParameters.getJdbcDriver().equals( "" ); - if( lIsDriverSet ) - { - if( pParameters.isKeepDriverClassLoadMessages() ) - { - loadDriverClass( pJdbcConnectParameters ); - } - else - { - PrintStream lOriginalSystemErr = System.err; - PrintStream lOriginalSystemOut = System.out; - - try - { - // oracle driver logs MBean Registration-Messages that cant be - // prevented otherwise - System.setErr( new PrintStream( new ByteArrayOutputStream() ) ); - System.setOut( new PrintStream( new ByteArrayOutputStream() ) ); - loadDriverClass( pJdbcConnectParameters ); - } - finally - { - System.setErr( lOriginalSystemErr ); - System.setOut( lOriginalSystemOut ); - } + _connection = pConnection; + _parameters = pParameters; + _proxyUser = pProxyUser; } - } - - String lUsername = pJdbcConnectParameters.getJdbcUser(); - String lProxyUser = null; - if ( pJdbcConnectParameters.getJdbcUrl().startsWith( "jdbc:oracle" ) - && lUsername != null - && lUsername.matches("\\.+\\[\\.+\\]$")) - { - int startOfProxy = lUsername.indexOf("["); - - lProxyUser = lUsername.substring(startOfProxy+1, lUsername.length()-1); - pJdbcConnectParameters.setJdbcUser(lUsername.substring(0, startOfProxy)); - } - - Connection lConnection; - - Properties lProperties = new Properties(); - lProperties.setProperty( "user", pJdbcConnectParameters.getJdbcUser() ); - lProperties.setProperty( "password", pJdbcConnectParameters.getJdbcPassword() ); - - try - { - lConnection = DriverManager.getConnection(pJdbcConnectParameters.getJdbcUrl(), lProperties); - } - catch (Exception e) { - throw new RuntimeException("connection failed: jdbc-url:" + pJdbcConnectParameters.getJdbcUrl() + " user: " + pJdbcConnectParameters.getJdbcUser(), e); - } - - if (lProxyUser != null) - { - OracleDriverSpecificHandler.openProxyConnection(lConnection, lProxyUser); - } - - try - { - pRunWithCallableStatementProvider.run( new CallableStatementProviderImpl( lConnection, pParameters ) ); - } - finally - { - if (lProxyUser != null) - { - OracleDriverSpecificHandler.closeConnection(lConnection); + + @Override + public void close() { + if (_proxyUser != null) { + OracleDriverSpecificHandler.closeConnection(_connection); + } + try { + _connection.close(); + } catch (SQLException e) { + throw new RuntimeException(e); + } } - lConnection.close(); - } } - catch( Exception e ) - { - throw new RuntimeException( e ); + + public interface RunWithCallableStatementProvider { + void run(CallableStatementProvider pCallableStatementProvider) throws Exception; } - } - - private static void loadDriverClass( Parameters.JdbcConnectParameters pJdbcConnectParameters ) throws ClassNotFoundException - { - Class.forName( pJdbcConnectParameters.getJdbcDriver() ); - } - - public static Struct createStruct( String pTypeName, Object[] pAttributes, CallableStatementProvider pCallableStatementProvider ) - { - try - { - CallableStatementProviderImpl lCallableStatementProviderImpl = (CallableStatementProviderImpl) pCallableStatementProvider; - return lCallableStatementProviderImpl._connection.createStruct( lCallableStatementProviderImpl._parameters.getOrcasDbUser().toUpperCase() + "." + pTypeName.toUpperCase(), pAttributes ); + + public static void runWithCallableStatementProvider(Parameters pParameters, RunWithCallableStatementProvider pRunWithCallableStatementProvider) + throws Exception { + runWithCallableStatementProvider(pParameters, pParameters.getJdbcConnectParameters(), pRunWithCallableStatementProvider); } - catch( SQLException e ) - { - throw new RuntimeException( e ); + + public static void runWithCallableStatementProvider( + Parameters pParameters, + Parameters.JdbcConnectParameters pJdbcConnectParameters, + RunWithCallableStatementProvider pRunWithCallableStatementProvider) throws Exception { + try (CallableStatementProviderImpl lCallableStatementProvider = createCallableStatementProvider(pParameters, pJdbcConnectParameters)) { + pRunWithCallableStatementProvider.run(lCallableStatementProvider); + } } - } - public static Array createArrayOf( String pTypeName, Object[] pElements, CallableStatementProvider pCallableStatementProvider ) - { - CallableStatementProviderImpl lCallableStatementProviderImpl = (CallableStatementProviderImpl) pCallableStatementProvider; - return OracleDriverSpecificHandler.call_OracleConnection_createARRAY( lCallableStatementProviderImpl._connection, lCallableStatementProviderImpl._parameters.getOrcasDbUser().toUpperCase() + "." + pTypeName.toUpperCase(), pElements ); - } + public static CallableStatementProviderImpl createCallableStatementProvider( + Parameters pParameters, + JdbcConnectParameters pJdbcConnectParameters) { + boolean lIsDriverSet = pJdbcConnectParameters.getJdbcDriver() != null && !pJdbcConnectParameters.getJdbcDriver().equals(""); + if (lIsDriverSet) { + if (pParameters.isKeepDriverClassLoadMessages()) { + loadDriverClass(pJdbcConnectParameters); + } else { + PrintStream lOriginalSystemErr = System.err; + PrintStream lOriginalSystemOut = System.out; + + try { + // oracle driver logs MBean Registration-Messages that cant be + // prevented otherwise + System.setErr(new PrintStream(new ByteArrayOutputStream())); + System.setOut(new PrintStream(new ByteArrayOutputStream())); + loadDriverClass(pJdbcConnectParameters); + } finally { + System.setErr(lOriginalSystemErr); + System.setOut(lOriginalSystemOut); + } + } + } + + String lUsername = pJdbcConnectParameters.getJdbcUser(); + String lProxyUser = null; + if (pJdbcConnectParameters.getJdbcUrl().startsWith("jdbc:oracle") + && lUsername != null + && lUsername.matches("\\.+\\[\\.+\\]$")) { + int startOfProxy = lUsername.indexOf("["); - public static Clob createClob( String pValue, CallableStatementProvider pCallableStatementProvider ) - { - try - { - CallableStatementProviderImpl lCallableStatementProviderImpl = (CallableStatementProviderImpl) pCallableStatementProvider; + lProxyUser = lUsername.substring(startOfProxy + 1, lUsername.length() - 1); + pJdbcConnectParameters.setJdbcUser(lUsername.substring(0, startOfProxy)); + } - Clob lClob = OracleDriverSpecificHandler.call_CLOB_createTemporary_MODE_READWRITE( lCallableStatementProviderImpl._connection ); + Connection lConnection = null; - Writer lSetCharacterStream = lClob.setCharacterStream( 1 ); - lSetCharacterStream.append( pValue ); + Properties lProperties = new Properties(); + lProperties.setProperty("user", pJdbcConnectParameters.getJdbcUser()); + lProperties.setProperty("password", pJdbcConnectParameters.getJdbcPassword()); - lSetCharacterStream.close(); + try { + lConnection = DriverManager.getConnection(pJdbcConnectParameters.getJdbcUrl(), lProperties); + } catch (Exception e) { + throw new RuntimeException("connection failed: jdbc-url:" + + pJdbcConnectParameters.getJdbcUrl() + + " user: " + + pJdbcConnectParameters.getJdbcUser(), e); + } - return lClob; + CallableStatementProviderImpl lCallableStatementProvider = new CallableStatementProviderImpl(lConnection, pParameters, lProxyUser); + + try { + if (lProxyUser != null) { + OracleDriverSpecificHandler.openProxyConnection(lConnection, lProxyUser); + } + } catch (Exception e) { + try { + lConnection.close(); + } catch (SQLException pE) { + throw new RuntimeException(pE); + } + throw new RuntimeException(e); + } + return lCallableStatementProvider; } - catch( SQLException e ) - { - throw new RuntimeException( e ); + + private static void loadDriverClass(Parameters.JdbcConnectParameters pJdbcConnectParameters) { + try { + Class.forName(pJdbcConnectParameters.getJdbcDriver()); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + } + + public static Struct createStruct(String pTypeName, Object[] pAttributes, CallableStatementProvider pCallableStatementProvider) { + try { + CallableStatementProviderImpl lCallableStatementProviderImpl = (CallableStatementProviderImpl) pCallableStatementProvider; + return lCallableStatementProviderImpl._connection.createStruct(lCallableStatementProviderImpl._parameters + .getOrcasDbUser() + .toUpperCase() + + "." + + pTypeName.toUpperCase(), pAttributes); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + + public static Array createArrayOf(String pTypeName, Object[] pElements, CallableStatementProvider pCallableStatementProvider) { + CallableStatementProviderImpl lCallableStatementProviderImpl = (CallableStatementProviderImpl) pCallableStatementProvider; + return OracleDriverSpecificHandler.call_OracleConnection_createARRAY( + lCallableStatementProviderImpl._connection, + lCallableStatementProviderImpl._parameters.getOrcasDbUser().toUpperCase() + "." + pTypeName.toUpperCase(), + pElements); } - catch( IOException e ) - { - throw new RuntimeException( e ); + + public static Clob createClob(String pValue, CallableStatementProvider pCallableStatementProvider) { + try { + CallableStatementProviderImpl lCallableStatementProviderImpl = (CallableStatementProviderImpl) pCallableStatementProvider; + + Clob lClob = OracleDriverSpecificHandler.call_CLOB_createTemporary_MODE_READWRITE(lCallableStatementProviderImpl._connection); + + Writer lSetCharacterStream = lClob.setCharacterStream(1); + lSetCharacterStream.append(pValue); + + lSetCharacterStream.close(); + + return lClob; + } catch (SQLException e) { + throw new RuntimeException(e); + } catch (IOException e) { + throw new RuntimeException(e); + } } - } } diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManager.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManager.java new file mode 100644 index 00000000..242330b2 --- /dev/null +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManager.java @@ -0,0 +1,9 @@ +package de.opitzconsulting.orcas.diff; + +import de.opitzconsulting.orcas.sql.CallableStatementProvider; + +public interface MultiSchemaConnectionManager { + void releaseAllConnections(); + + CallableStatementProvider getCallableStatementProviderForSchema(CallableStatementProvider pCallableStatementProviderDefault, String pSchemaName, Parameters pParameters); +} diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManagerProxyConnect.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManagerProxyConnect.java new file mode 100644 index 00000000..ea64fe04 --- /dev/null +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManagerProxyConnect.java @@ -0,0 +1,17 @@ +package de.opitzconsulting.orcas.diff; + +import de.opitzconsulting.orcas.diff.Parameters.JdbcConnectParameters; + +public class MultiSchemaConnectionManagerProxyConnect extends BaseMultiSchemaConnectionManager { + @Override + protected JdbcConnectParameters getJdbcConnectParametersForSchema(String pSchemaName, Parameters pParameters) { + JdbcConnectParameters lJdbcConnectParameters = new JdbcConnectParameters(); + + lJdbcConnectParameters.setJdbcUrl(pParameters.getJdbcConnectParameters().getJdbcUrl()); + lJdbcConnectParameters.setJdbcDriver(pParameters.getJdbcConnectParameters().getJdbcDriver()); + lJdbcConnectParameters.setJdbcUser(pParameters.getJdbcConnectParameters().getJdbcUser() + "[" + pSchemaName + "]"); + lJdbcConnectParameters.setJdbcPassword(pParameters.getJdbcConnectParameters().getJdbcPassword()); + + return lJdbcConnectParameters; + } +} diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManagerSimple.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManagerSimple.java new file mode 100644 index 00000000..d49ec0bb --- /dev/null +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/MultiSchemaConnectionManagerSimple.java @@ -0,0 +1,15 @@ +package de.opitzconsulting.orcas.diff; + +import de.opitzconsulting.orcas.sql.CallableStatementProvider; + +public class MultiSchemaConnectionManagerSimple implements MultiSchemaConnectionManager { + @Override + public void releaseAllConnections() { + } + + @Override + public CallableStatementProvider getCallableStatementProviderForSchema( + CallableStatementProvider pCallableStatementProviderDefault, String pSchemaName, Parameters pParameters) { + return pCallableStatementProviderDefault; + } +} diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java index 36b53481..b5841cb7 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasDiff.java @@ -780,7 +780,21 @@ private void handleAllTables( ModelDiff pModelDiff ) } else { - createIfNeededOrAlter( lForeignKeyDiff, p -> ddlBuilder.createForeignKey( p, lTableDiff, lForeignKeyDiff, _parameters.getMultiSchema(), dataHandler ), p -> ddlBuilder.alterForeignKeyIfNeeded( p, lTableDiff, lForeignKeyDiff, dataHandler ) ); + if( _parameters.getMultiSchema() ) { + if( lForeignKeyDiff.isNew ) + { + if( lForeignKeyDiff.isOld == false ) + { + DiffAction lDiffAction = new DiffAction( new DiffReasonKey(lForeignKeyDiff.destTableNew), DiffReasonType.CREATE ); + + doInDiffAction( lDiffAction, Collections.singletonList( new DiffActionReasonMissing( diffReasonKeyRegistry.getDiffReasonKey( + lForeignKeyDiff) ) ), + (DiffActionRunnable) p -> ddlBuilder.createForeignKeyGrantIfNeeded(p, lTableDiff, lForeignKeyDiff), createStatementBuilder() ); + } + } + } + + createIfNeededOrAlter( lForeignKeyDiff, p -> ddlBuilder.createForeignKey( p, lTableDiff, lForeignKeyDiff, dataHandler ), p -> ddlBuilder.alterForeignKeyIfNeeded( p, lTableDiff, lForeignKeyDiff, dataHandler ) ); } } } ); diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasMain.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasMain.java index a3eebab8..0d71e977 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasMain.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/OrcasMain.java @@ -99,13 +99,21 @@ private void handleRelevanceCheck(DiffResult pDiffResult, Parameters pParameters boolean lIgnore = false; - if (lIsTable && pParameters.getRelevantTables() != null) { - if (!pParameters.getRelevantTables().contains(p.getDiffReasonKey().getTextObjectName())) { + String lTextObjectName = p.getDiffReasonKey().getTextObjectName(); + + if( p.getDiffReasonKey().getTextSchemaName() != null ){ + lTextObjectName = p.getDiffReasonKey().getTextSchemaName() + "." + lTextObjectName; + } + + lTextObjectName = lTextObjectName.toUpperCase(); + + if (lIsTable && pParameters.getRelevantTables() != null) { + if (!pParameters.getRelevantTables().contains(lTextObjectName)) { lIgnore = true; } } if (lIsSequence && pParameters.getRelevantSequences() != null) { - if (!pParameters.getRelevantSequences().contains(p.getDiffReasonKey().getTextObjectName())) { + if (!pParameters.getRelevantSequences().contains(lTextObjectName)) { lIgnore = true; } } @@ -144,83 +152,69 @@ private de.opitzconsulting.origOrcasDsl.Model modifyModel( de.opitzconsulting.or private void handleDiffResult( Parameters pParameters, CallableStatementProvider pCallableStatementProvider, DiffResult pOriginalDiffResult ) { - DiffResult lDiffResult = pOriginalDiffResult; - - if( pParameters.getXmlInputFile() != null ) - { - logInfo( "applying xml input file: " + pParameters.getXmlInputFile() ); - lDiffResult = getXmlLogFileHandler().handleXmlInputFile( lDiffResult, pParameters.getXmlInputFile(), getParameters().getXmlLogFile() ); - } - else - { - if( getParameters().getXmlLogFile() != null ) - { - getXmlLogFileHandler().logXml( lDiffResult, getParameters().getXmlLogFile() ); - } - } - - List lScriptLines = new ArrayList(); - - for( DiffAction lDiffAction : lDiffResult.getDiffActions() ) - { - for( Statement lStatementClass : lDiffAction.getStatements() ) - { - if( lStatementClass.isFailure() ) - { - throw new RuntimeException( lStatementClass.getComment() + ":" + lStatementClass.getStatement() ); + try { + DiffResult lDiffResult = pOriginalDiffResult; + + if (pParameters.getXmlInputFile() != null) { + logInfo("applying xml input file: " + pParameters.getXmlInputFile()); + lDiffResult = getXmlLogFileHandler().handleXmlInputFile(lDiffResult, pParameters.getXmlInputFile(), getParameters().getXmlLogFile()); + } else { + if (getParameters().getXmlLogFile() != null) { + getXmlLogFileHandler().logXml(lDiffResult, getParameters().getXmlLogFile()); + } } - } - } - - for( DiffAction lDiffAction : lDiffResult.getDiffActions() ) - { - for( Statement lStatementClass : lDiffAction.getStatements() ) - { - String lStatement = lStatementClass.getStatement(); - int lMaxLineLength = 2000; + List lScriptLines = new ArrayList(); - lStatement = addLineBreaksIfNeeded( lStatement, lMaxLineLength ); - String lStatementToExecute = lStatement; - - if( !lStatementClass.isIgnore() || getParameters().isLogIgnoredStatements() ) - { - if( lStatementClass.isIgnore() ) - { - lStatement = "-- ignore-" + lStatementClass.getComment() + ": " + lStatement; - } - else - { - if( lStatementClass.getComment() != null ) - { - lStatement = lStatement + " -- " + lStatementClass.getComment(); + for (DiffAction lDiffAction : lDiffResult.getDiffActions()) { + for (Statement lStatementClass : lDiffAction.getStatements()) { + if (lStatementClass.isFailure()) { + throw new RuntimeException(lStatementClass.getComment() + ":" + lStatementClass.getStatement()); + } } - } + } - if( lStatement.endsWith( ";" ) ) - { - lScriptLines.add( lStatement ); - lScriptLines.add( "/" ); - logInfo( lStatement ); - logInfo( "/" ); - } - else - { - lScriptLines.add( lStatement + ";" ); - logInfo( lStatement + ";" ); - } + for (DiffAction lDiffAction : lDiffResult.getDiffActions()) { + for (Statement lStatementClass : lDiffAction.getStatements()) { + String lStatement = lStatementClass.getStatement(); + + int lMaxLineLength = 2000; + + lStatement = addLineBreaksIfNeeded(lStatement, lMaxLineLength); + String lStatementToExecute = lStatement; + + if (!lStatementClass.isIgnore() || getParameters().isLogIgnoredStatements()) { + if (lStatementClass.isIgnore()) { + lStatement = "-- ignore-" + lStatementClass.getComment() + ": " + lStatement; + } else { + if (lStatementClass.getComment() != null) { + lStatement = lStatement + " -- " + lStatementClass.getComment(); + } + } + + if (lStatement.endsWith(";")) { + lScriptLines.add(lStatement); + lScriptLines.add("/"); + logInfo(lStatement); + logInfo("/"); + } else { + lScriptLines.add(lStatement + ";"); + logInfo(lStatement + ";"); + } + } + + if (!pParameters.isLogonly() && !lStatementClass.isIgnore()) { + getDatabaseHandler().executeDiffResultStatement(lStatementToExecute, getParameters().getMultiSchemaConnectionManager().getCallableStatementProviderForSchema(pCallableStatementProvider, lDiffAction.getDiffReasonKey().getTextSchemaName(), getParameters()) ); + } + } } - if( !pParameters.isLogonly() && !lStatementClass.isIgnore() ) - { - getDatabaseHandler().executeDiffResultStatement( lStatementToExecute, pCallableStatementProvider ); + if (!lScriptLines.isEmpty()) { + addSpoolfolderScriptIfNeeded(lScriptLines, pParameters.getLogname() + ".sql"); } - } } - - if( !lScriptLines.isEmpty() ) - { - addSpoolfolderScriptIfNeeded( lScriptLines, pParameters.getLogname() + ".sql" ); + finally { + getParameters().getMultiSchemaConnectionManager().releaseAllConnections(); } } diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/Parameters.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/Parameters.java index 0b90b63b..4964a294 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/Parameters.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/Parameters.java @@ -10,6 +10,8 @@ import org.eclipse.emf.ecore.EObject; +import de.opitzconsulting.orcas.sql.CallableStatementProvider; + public abstract class Parameters { public static class JdbcConnectParameters @@ -65,6 +67,14 @@ public static enum FailOnErrorMode NEVER, ALWAYS, IGNORE_DROP } + public void setMultiSchemaConnectionManager(MultiSchemaConnectionManager pMultiSchemaConnectionManager) { + _multiSchemaConnectionManager = pMultiSchemaConnectionManager; + if(_multiSchemaConnectionManager instanceof BaseMultiSchemaConnectionManager){ + ((BaseMultiSchemaConnectionManager)_multiSchemaConnectionManager).setParameters(this); + } + } + + private MultiSchemaConnectionManager _multiSchemaConnectionManager = new MultiSchemaConnectionManagerSimple(); protected JdbcConnectParameters _jdbcConnectParameters = new JdbcConnectParameters(); protected JdbcConnectParameters _srcJdbcConnectParameters; protected JdbcConnectParameters _orcasJdbcConnectParameters; @@ -286,6 +296,11 @@ public JdbcConnectParameters getJdbcConnectParameters() return _jdbcConnectParameters; } + public MultiSchemaConnectionManager getMultiSchemaConnectionManager() + { + return _multiSchemaConnectionManager; + } + public boolean isLogonly() { return checkNull( _logonly ); diff --git a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/XmlLogFileHandler.java b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/XmlLogFileHandler.java index 69ad3bad..067c4d8a 100644 --- a/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/XmlLogFileHandler.java +++ b/orcas_core/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/XmlLogFileHandler.java @@ -34,6 +34,7 @@ public class XmlLogFileHandler private static final String TAG_DIFF_ACTION_ATTRIBUTE_RECREATE = "recreate"; private static final String TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_OBJECT_TYPE = "object-type"; private static final String TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_OBJECT_NAME = "object-name"; + private static final String TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_SCHEMA_NAME = "schema-name"; private static final String TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_SUBOBJECT_TYPE = "subobject-type"; private static final String TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_SUBOBJECT_NAME = "subobject-name"; @@ -125,6 +126,9 @@ private void setDiffReasonKeyToElement( DiffReasonKey pDiffReasonKey, Element pE pElement.setAttribute( TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_SUBOBJECT_TYPE, pDiffReasonKey.getTextSubobjectType() ); } pElement.setAttribute( TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_OBJECT_NAME, pDiffReasonKey.getTextObjectName() ); + if(pDiffReasonKey.getTextSchemaName()!=null){ + pElement.setAttribute( TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_SCHEMA_NAME, pDiffReasonKey.getTextSchemaName() ); + } if( pDiffReasonKey.getTextSubobjectName() != null ) { pElement.setAttribute( TAG_DIFF_ACTION_AND_REASON__ATTRIBUTE_SUBOBJECT_NAME, pDiffReasonKey.getTextSubobjectName() ); diff --git a/orcas_core/build_source/orcas_main_extensionhandler/src/main/java/de/opitzconsulting/orcas/diff/ExtensionHandlerImpl.java b/orcas_core/build_source/orcas_main_extensionhandler/src/main/java/de/opitzconsulting/orcas/diff/ExtensionHandlerImpl.java index c4449d93..5695a82e 100644 --- a/orcas_core/build_source/orcas_main_extensionhandler/src/main/java/de/opitzconsulting/orcas/diff/ExtensionHandlerImpl.java +++ b/orcas_core/build_source/orcas_main_extensionhandler/src/main/java/de/opitzconsulting/orcas/diff/ExtensionHandlerImpl.java @@ -146,6 +146,7 @@ protected List getTableNames(de.opitzconsulting.orcasDsl.Model pModel) { .filter(p->p instanceof Table) .map(p->(Table)p) .map(Table::getName) + .map(String::toUpperCase) .collect(Collectors.toList()); } @@ -156,6 +157,7 @@ protected List getSequenceNames(de.opitzconsulting.orcasDsl.Model pModel .filter(p->p instanceof Sequence) .map(p->(Sequence)p) .map(Sequence::getSequence_name) + .map(String::toUpperCase) .collect(Collectors.toList()); } diff --git a/orcas_integrationstest/build.gradle b/orcas_integrationstest/build.gradle index f539e357..71176636 100644 --- a/orcas_integrationstest/build.gradle +++ b/orcas_integrationstest/build.gradle @@ -11,7 +11,7 @@ dependencies compile group: 'com.opitzconsulting.orcas', name: 'orcas-main-extensionhandler', version: '5.8.5' - classpath group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' + compile group: 'com.oracle.ojdbc', name: 'ojdbc8', version: '19.3.0.0' } @@ -37,7 +37,7 @@ test { systemProperty "orcas.integrationtest.execute_tests", execute_tests systemProperty "orcas.integrationtest.available_feature_list", available_feature_list - systemProperty "orcas.integrationtest.jdbc_url", "jdbc:oracle:thin:@${jdbc_host}:${jdbc_port}:${jdbc_sid}" + systemProperty "orcas.integrationtest.jdbc_url", default_jdbcurl systemProperty "orcas.integrationtest.jdbc_user", username_dba systemProperty "orcas.integrationtest.jdbc_password", password_dba systemProperty "orcas.integrationtest.alternate_tablespace_1", alternate_tablespace_1 diff --git a/orcas_integrationstest/distribution/default.properties b/orcas_integrationstest/distribution/default.properties index ea543db4..faca531c 100644 --- a/orcas_integrationstest/distribution/default.properties +++ b/orcas_integrationstest/distribution/default.properties @@ -16,7 +16,7 @@ available_feature_list= orcas.default_tnsname = ${database} jdbc_port=1521 -orcas.default_jdbcurl=jdbc:oracle:thin:@${jdbc_host}:${jdbc_port}:${jdbc_sid} +default_jdbcurl=jdbc:oracle:thin:@${jdbc_host}:${jdbc_port}:${jdbc_sid} with_second_run_empty_test = true