You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/04 16:15:09 UTC
[2/7] ignite git commit: Merge branches 'ignite-843' and 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35f07027
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35f07027
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35f07027
Branch: refs/heads/ignite-843
Commit: 35f070274075cf6cf9dd948e5c97c5b73c3601b3
Parents: d32674e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Aug 21 19:38:32 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Aug 21 19:38:32 2015 +0700
----------------------------------------------------------------------
.../ignite/schema/parser/DbMetadataReader.java | 4 +++-
.../schema/parser/DatabaseMetadataParser.java | 1 +
.../apache/ignite/schema/ui/SchemaImportApp.java | 18 +++++++++++++++++-
3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35f07027/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbMetadataReader.java
----------------------------------------------------------------------
diff --git a/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbMetadataReader.java b/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbMetadataReader.java
index 31466b5..76dcdd3 100644
--- a/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbMetadataReader.java
+++ b/modules/schema-import-db/src/main/java/org/apache/ignite/schema/parser/DbMetadataReader.java
@@ -70,7 +70,9 @@ public class DbMetadataReader {
dialect = new JdbcMetadataDialect();
}
- return dialect.tables(conn, tblsOnly);
+ List<String> schemas = new ArrayList<>();
+
+ return dialect.tables(conn, schemas, tblsOnly);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/35f07027/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
index fbda97b..9f4450f 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
@@ -19,6 +19,7 @@ package org.apache.ignite.schema.parser;
import javafx.collections.*;
import org.apache.ignite.schema.model.*;
+import org.apache.ignite.schema.parser.dialect.*;
import java.sql.*;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/ignite/blob/35f07027/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
index 9bf06a6..316ebf9 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/ui/SchemaImportApp.java
@@ -341,7 +341,7 @@ public class SchemaImportApp extends Application {
if (!pwd.isEmpty())
jdbcInfo.put("password", pwd);
- return connect(jdbcDrvJarPath, jdbcDrvCls, jdbcUrl, jdbcInfo);
+ return DbMetadataReader.getInstance().connect(jdbcDrvJarPath, jdbcDrvCls, jdbcUrl, jdbcInfo);
}
/**
@@ -360,8 +360,24 @@ public class SchemaImportApp extends Application {
lockUI(connLayerPnl, connPnl, nextBtn);
+ final String jdbcDrvJarPath = jdbcDrvJarTf.getText().trim();
+
+ final String jdbcDrvCls = jdbcDrvClsTf.getText();
+
final String jdbcUrl = jdbcUrlTf.getText();
+ final Properties jdbcInfo = new Properties();
+
+ String user = userTf.getText().trim();
+
+ String pwd = pwdTf.getText().trim();
+
+ if (!user.isEmpty())
+ jdbcInfo.put("user", user);
+
+ if (!pwd.isEmpty())
+ jdbcInfo.put("password", pwd);
+
final boolean tblsOnly = parseCb.getSelectionModel().getSelectedIndex() == 0;
Runnable task = new Task<Void>() {