Merge remote-tracking branch 'origin/ignite-1.3.3-p3' into ignite-1.3.3-p3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/abbd308d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/abbd308d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/abbd308d Branch: refs/heads/ignite-1258 Commit: abbd308da5ce8ef5260b511e41e6b394e1877d8b Parents: d78e8bc afadd36 Author: sboikov <sboi...@gridgain.com> Authored: Thu Aug 20 14:40:05 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Aug 20 14:40:05 2015 +0300 ---------------------------------------------------------------------- .../cache/store/jdbc/CacheJdbcPojoStore.java | 20 +-- .../store/jdbc/CacheJdbcPojoStoreTest.java | 24 ++- .../ignite/schema/model/PojoDescriptor.java | 6 +- .../ignite/schema/model/SchemaDescriptor.java | 61 +++++++ .../schema/parser/DatabaseMetadataParser.java | 54 +++++-- .../parser/dialect/DB2MetadataDialect.java | 3 +- .../parser/dialect/DatabaseMetadataDialect.java | 13 +- .../parser/dialect/JdbcMetadataDialect.java | 129 +++++++++------ .../parser/dialect/MySQLMetadataDialect.java | 57 +++++++ .../parser/dialect/OracleMetadataDialect.java | 111 +++++++++---- .../org/apache/ignite/schema/ui/Controls.java | 25 ++- .../ignite/schema/ui/SchemaImportApp.java | 157 ++++++++++++++++--- .../schema/test/AbstractSchemaImportTest.java | 10 +- .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 3 - 14 files changed, 535 insertions(+), 138 deletions(-) ----------------------------------------------------------------------
