Merge branch '3.10' of https://github.com/JumpMind/symmetric-ds.git i…

…nto 3.10
JumpMind · Jan 10, 2019 · 7a341bc · 7a341bc
2 parents f38f4cc + 61bbc6e
commit 7a341bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataExtractorService.java
@@ -1588,7 +1588,7 @@ public void updateExtractRequestLoadTime(Date loadTime, OutgoingBatch outgoingBa
             transaction = sqlTemplate.startSqlTransaction();
 
             dataService.updateTableReloadRequestsLoadedCounts(transaction, outgoingBatch.getLoadId(), 1, 
-                    outgoingBatch.getReloadRowCount() > 0 ? outgoingBatch.getDataRowCount() : 0);
+                    outgoingBatch.getReloadRowCount() > 0 ? outgoingBatch.getReloadRowCount() : 0);
 
 
             transaction.prepareAndExecute(getSql("updateExtractRequestLoadTime"), outgoingBatch.getBatchId(), outgoingBatch.getDataRowCount(), 

diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/oracle/OracleDdlReader.java
@@ -339,7 +339,7 @@ protected Collection<IIndex> readIndices(Connection connection,
         StringBuilder query = new StringBuilder();
 
         query.append("SELECT a.INDEX_NAME, a.INDEX_TYPE, a.UNIQUENESS, b.COLUMN_NAME, b.COLUMN_POSITION FROM ALL_INDEXES a "); 
-        query.append("JOIN ALL_IND_COLUMNS b ON a.table_name = b.table_name AND a.INDEX_NAME=b.INDEX_NAME ");
+        query.append("JOIN ALL_IND_COLUMNS b ON a.table_name = b.table_name AND a.INDEX_NAME=b.INDEX_NAME AND a.TABLE_OWNER = b.TABLE_OWNER ");
         query.append("WHERE ");
         query.append("a.TABLE_NAME = ? "); 
         query.append("AND a.GENERATED='N' ");