Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F40EB18FA6 for ; Wed, 5 Aug 2015 15:52:13 +0000 (UTC) Received: (qmail 90444 invoked by uid 500); 5 Aug 2015 15:52:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 90411 invoked by uid 500); 5 Aug 2015 15:52:13 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 90402 invoked by uid 99); 5 Aug 2015 15:52:13 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Aug 2015 15:52:13 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5565FC0045 for ; Wed, 5 Aug 2015 15:52:13 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id uTSA8wbCkkSm for ; Wed, 5 Aug 2015 15:52:02 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id ABBF2429BC for ; Wed, 5 Aug 2015 15:52:01 +0000 (UTC) Received: (qmail 89313 invoked by uid 99); 5 Aug 2015 15:52:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Aug 2015 15:52:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FD41DFBD5; Wed, 5 Aug 2015 15:52:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 05 Aug 2015 15:52:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/33] incubator-ignite git commit: IGNITE-1158 Fixed duplicate fields generation in case of same table in different schemas. 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-1093 Commit: 41c76a729da9668c6ffefbaa99c0f2dbf9709115 Parents: 7f94a40 Author: AKuznetsov Authored: Fri Jul 31 16:33:11 2015 +0700 Committer: AKuznetsov 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 = "";