multischema index columns bugfix

opitzconsulting · Oct 10, 2019 · e99ad31 · e99ad31
1 parent e25964f
commit e99ad31
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
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
@@ -7,6 +7,7 @@ create table orcas_orderentry_meta.categories
 
   constraint ctgr_pk primary key (ctgr_id),
   constraint ctgr_uc unique (name),
+  index orcas_orderentry_data.ctgr_description_ix (description),
 
   comment on column version is 'default ist null';
   comment on table is 'categories tabelle';

diff --git a/...re/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/LoadIstOracle.java b/...re/build_source/orcas_diff/src/main/java/de/opitzconsulting/orcas/diff/LoadIstOracle.java
@@ -164,7 +164,7 @@ public Model loadModel( boolean pWithSequeneceMayValueSelect )
     isIgnoredSequence( "TEST", "TEST" );
     isIgnoredMView( "TEST", "TEST" );
     isIgnoredTable( "TEST", "TEST" );
-    isIgnoredIndex( "TEST", "TEST", "TEST" );
+    isIgnoredIndex( "TEST", "TEST", "TEST", "TEST" );
 
     _oracleMajorVersion = loadOracleMajorVersion();
 
@@ -378,7 +378,7 @@ private String getIndexNameWithOwner( String pTableName, String pIndexName, Stri
     return getNameWithOwner( pTableName + "." + pIndexName, pOwner );
   }
 
-  private boolean isIgnoredIndex( String pTableName, String pIndexName, String pOwner )
+  private boolean isIgnoredIndex( String pTableName, String pIndexName, String pTableOwner, String pIndexOwner )
   {
     if( excludeIndexList == null )
     {
@@ -400,12 +400,12 @@ protected void useResultSetRow( ResultSet pResultSet ) throws SQLException
       }.execute();
     }
 
-    if( excludeIndexList.contains( getIndexNameWithOwner( pTableName, pIndexName, pOwner ) ) )
+    if( excludeIndexList.contains( getIndexNameWithOwner( pTableName, pIndexName, pTableOwner ) ) )
     {
       return true;
     }
 
-    return isIgnoredTable( pTableName, pOwner );
+    return isIgnoredTable( pTableName, pTableOwner );
   }
 
   private BigInteger toBigInt( BigDecimal pBigDecimal )
@@ -1171,7 +1171,7 @@ private void loadIndexesIntoModel( final Model pModel )
       @Override
       protected void useResultSetRow( ResultSet pResultSet ) throws SQLException
       {
-        if( !isIgnoredIndex( pResultSet.getString( "table_name" ), pResultSet.getString( "index_name" ), pResultSet.getString( "table_owner" ) ) )
+        if( !isIgnoredIndex( pResultSet.getString( "table_name" ), pResultSet.getString( "index_name" ), pResultSet.getString( "table_owner" ), pResultSet.getString( "owner" ) ) )
         {
           final Index lIndex = new IndexImpl();
 
@@ -1261,7 +1261,7 @@ private void loadIndexColumnsIntoModel( final Model pModel )
       @Override
       protected void useResultSetRow( ResultSet pResultSet ) throws SQLException
       {
-        if( !isIgnoredIndex( pResultSet.getString( "table_name" ), pResultSet.getString( "index_name" ), pResultSet.getString( "owner" ) ) )
+        if( !isIgnoredIndex( pResultSet.getString( "table_name" ), pResultSet.getString( "index_name" ), pResultSet.getString( "table_owner" ), pResultSet.getString( "owner" ) ) )
         {
           ColumnRef lColumnRef = new ColumnRefImpl();
 
@@ -1337,7 +1337,7 @@ private void loadIndexExpressionsIntoModel( final Model pModel )
       @Override
       protected void useResultSetRow( ResultSet pResultSet ) throws SQLException
       {
-        if( !isIgnoredIndex( pResultSet.getString( "table_name" ), pResultSet.getString( "index_name" ), pResultSet.getString( "owner" ) ) )
+        if( !isIgnoredIndex( pResultSet.getString( "table_name" ), pResultSet.getString( "index_name" ), pResultSet.getString( "table_owner" ), pResultSet.getString( "owner" ) ) )
         {
           setIndexColumnExpression( pModel, pResultSet.getString( "table_name" ), pResultSet.getString( "table_owner" ), pResultSet.getString( "index_name" ), pResultSet.getString( "owner" ), pResultSet.getInt( "column_position" ), pResultSet.getString( "column_expression" ), pResultSet.getInt( "max_column_position_for_index" ) );
         }