ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject incubator-ignite git commit: IGNITE-1158 Fixed duplicate fields generation in case of same table in different schemas.
Date Fri, 31 Jul 2015 09:33:14 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1.3.3 7f94a40e6 -> 41c76a729


IGNITE-1158 Fixed duplicate fields generation in case of same table in different schemas.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41c76a72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41c76a72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41c76a72

Branch: refs/heads/ignite-1.3.3
Commit: 41c76a729da9668c6ffefbaa99c0f2dbf9709115
Parents: 7f94a40
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Jul 31 16:33:11 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Jul 31 16:33:11 2015 +0700

----------------------------------------------------------------------
 .../ignite/schema/parser/dialect/OracleMetadataDialect.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41c76a72/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
index 855c9f7..860ff68 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/dialect/OracleMetadataDialect.java
@@ -42,7 +42,7 @@ public class OracleMetadataDialect extends DatabaseMetadataDialect {
         " WHERE a.owner = ? and a.table_name = ? AND a.constraint_type = 'P'";
 
     /** SQL to get indexes metadata. */
-    private static final String SQL_INDEXES = "select i.index_name, u.column_expression,
i.column_name, i.descend" +
+    private static final String SQL_INDEXES = "SELECT i.index_name, u.column_expression,
i.column_name, i.descend" +
         " FROM all_ind_columns i" +
         " LEFT JOIN user_ind_expressions u on u.index_name = i.index_name and i.table_name
= u.table_name" +
         " WHERE i.index_owner = ? and i.table_name = ?" +
@@ -238,7 +238,7 @@ public class OracleMetadataDialect extends DatabaseMetadataDialect {
             String user = conn.getMetaData().getUserName().toUpperCase();
 
             String sql = String.format(SQL_COLUMNS,
-                tblsOnly ? "INNER JOIN all_tables b on a.table_name = b.table_name" : "",
user);
+                tblsOnly ? "INNER JOIN all_tables b on a.table_name = b.table_name and a.owner
= b.owner" : "", user);
 
             try (ResultSet colsRs = colsStmt.executeQuery(sql)) {
                 String prevSchema = "";


Mime
View raw message