You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2017/08/30 16:01:29 UTC
[2/6] ignite git commit: IGNITE-6125: JDBC thick: several fixes to
JdbcDatabaseMetadata. This closes #2506.
IGNITE-6125: JDBC thick: several fixes to JdbcDatabaseMetadata. This closes #2506.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/faa156f0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/faa156f0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/faa156f0
Branch: refs/heads/ignite-5896
Commit: faa156f0da68d49acbb3f446b3905ad2c64ae505
Parents: b7d198e
Author: Ilya Kasnacheev <il...@gmail.com>
Authored: Wed Aug 30 16:20:45 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed Aug 30 16:20:45 2017 +0300
----------------------------------------------------------------------
.../internal/jdbc2/JdbcMetadataSelfTest.java | 120 ++++-
.../internal/jdbc2/JdbcDatabaseMetadata.java | 466 ++++++++++---------
2 files changed, 360 insertions(+), 226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/faa156f0/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
index f2ef769..bc4ef5b 100755
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -21,12 +21,21 @@ import java.io.Serializable;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.DriverManager;
+import java.sql.ParameterMetaData;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.Statement;
+import java.sql.Types;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Set;
import org.apache.ignite.IgniteCache;
+import org.apache.ignite.cache.QueryEntity;
+import org.apache.ignite.cache.QueryIndex;
import org.apache.ignite.cache.affinity.AffinityKey;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -61,9 +70,20 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+ LinkedHashMap<String, Boolean> persFields = new LinkedHashMap<>();
+
+ persFields.put("name", true);
+ persFields.put("age", false);
+
cfg.setCacheConfiguration(
- cacheConfiguration("pers", AffinityKey.class, Person.class),
- cacheConfiguration("org", String.class, Organization.class));
+ cacheConfiguration("pers").setQueryEntities(Arrays.asList(
+ new QueryEntity(AffinityKey.class, Person.class)
+ .setIndexes(Arrays.asList(
+ new QueryIndex("orgId"),
+ new QueryIndex().setFields(persFields))))
+ ),
+ cacheConfiguration("org").setQueryEntities(Arrays.asList(
+ new QueryEntity(AffinityKey.class, Organization.class))));
TcpDiscoverySpi disco = new TcpDiscoverySpi();
@@ -78,11 +98,9 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
/**
* @param name Name.
- * @param clsK Class k.
- * @param clsV Class v.
* @return Cache configuration.
*/
- protected CacheConfiguration cacheConfiguration(@NotNull String name, Class<?> clsK, Class<?> clsV) {
+ protected CacheConfiguration cacheConfiguration(@NotNull String name) {
CacheConfiguration<?,?> cache = defaultCacheConfiguration();
cache.setName(name);
@@ -90,7 +108,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
cache.setBackups(1);
cache.setWriteSynchronizationMode(FULL_SYNC);
cache.setAtomicityMode(TRANSACTIONAL);
- cache.setIndexedTypes(clsK, clsV);
return cache;
}
@@ -194,7 +211,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
try (Connection conn = DriverManager.getConnection(BASE_URL)) {
DatabaseMetaData meta = conn.getMetaData();
- ResultSet rs = meta.getColumns("", "pers", "Person", "%");
+ ResultSet rs = meta.getColumns("", "pers", "PERSON", "%");
assertNotNull(rs);
@@ -227,7 +244,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
assertTrue(names.isEmpty());
assertEquals(3, cnt);
- rs = meta.getColumns("", "org", "Organization", "%");
+ rs = meta.getColumns("", "org", "ORGANIZATION", "%");
assertNotNull(rs);
@@ -287,10 +304,95 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
int cnt = 0;
while (rs.next()) {
+ String idxName = rs.getString("INDEX_NAME");
+ String field = rs.getString("COLUMN_NAME");
+ String ascOrDesc = rs.getString("ASC_OR_DESC");
+
+ assertEquals(DatabaseMetaData.tableIndexOther, rs.getInt("TYPE"));
+
+ if ("PERSON_ORGID_ASC_IDX".equals(idxName)) {
+ assertEquals("ORGID", field);
+ assertEquals("A", ascOrDesc);
+ }
+ else if ("PERSON_NAME_ASC_AGE_DESC_IDX".equals(idxName)) {
+ if ("NAME".equals(field))
+ assertEquals("A", ascOrDesc);
+ else if ("AGE".equals(field))
+ assertEquals("D", ascOrDesc);
+ else
+ fail("Unexpected field: " + field);
+ }
+ else
+ fail("Unexpected index: " + idxName);
+
+ cnt++;
+ }
+
+ assertEquals(3, cnt);
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPrimaryKeyMetadata() throws Exception {
+ try (Connection conn = DriverManager.getConnection(BASE_URL);
+ ResultSet rs = conn.getMetaData().getPrimaryKeys(null, "pers", "PERSON")) {
+
+ int cnt = 0;
+
+ while (rs.next()) {
+ assertEquals("_KEY", rs.getString("COLUMN_NAME"));
+
cnt++;
}
- assertEquals(0, cnt);
+ assertEquals(1, cnt);
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testParametersMetadata() throws Exception {
+ try (Connection conn = DriverManager.getConnection(BASE_URL)) {
+ conn.setSchema("pers");
+
+ PreparedStatement stmt = conn.prepareStatement("select orgId from Person p where p.name > ? and p.orgId > ?");
+
+ ParameterMetaData meta = stmt.getParameterMetaData();
+
+ assertNotNull(meta);
+
+ assertEquals(2, meta.getParameterCount());
+
+ assertEquals(Types.VARCHAR, meta.getParameterType(1));
+ assertEquals(ParameterMetaData.parameterNullableUnknown, meta.isNullable(1));
+ assertEquals(Integer.MAX_VALUE, meta.getPrecision(1));
+
+ assertEquals(Types.INTEGER, meta.getParameterType(2));
+ assertEquals(ParameterMetaData.parameterNullableUnknown, meta.isNullable(2));
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSchemasMetadata() throws Exception {
+ try (Connection conn = DriverManager.getConnection(BASE_URL)) {
+ ResultSet rs = conn.getMetaData().getSchemas();
+
+ Set<String> expectedSchemas = new HashSet<>(Arrays.asList("pers", "org"));
+
+ Set<String> schemas = new HashSet<>();
+
+ while (rs.next()) {
+ schemas.add(rs.getString(1));
+
+ assertNull(rs.getString(2));
+ }
+
+ assertEquals(expectedSchemas, schemas);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/faa156f0/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
index e9a5fde..aad6daa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java
@@ -66,67 +66,67 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public boolean allProceduresAreCallable() throws SQLException {
+ @Override public boolean allProceduresAreCallable() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean allTablesAreSelectable() throws SQLException {
+ @Override public boolean allTablesAreSelectable() {
return true;
}
/** {@inheritDoc} */
- @Override public String getURL() throws SQLException {
+ @Override public String getURL() {
return conn.url();
}
/** {@inheritDoc} */
- @Override public String getUserName() throws SQLException {
+ @Override public String getUserName() {
return "";
}
/** {@inheritDoc} */
- @Override public boolean isReadOnly() throws SQLException {
- return true;
+ @Override public boolean isReadOnly() {
+ return false;
}
/** {@inheritDoc} */
- @Override public boolean nullsAreSortedHigh() throws SQLException {
+ @Override public boolean nullsAreSortedHigh() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean nullsAreSortedLow() throws SQLException {
+ @Override public boolean nullsAreSortedLow() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean nullsAreSortedAtStart() throws SQLException {
+ @Override public boolean nullsAreSortedAtStart() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean nullsAreSortedAtEnd() throws SQLException {
+ @Override public boolean nullsAreSortedAtEnd() {
return true;
}
/** {@inheritDoc} */
- @Override public String getDatabaseProductName() throws SQLException {
+ @Override public String getDatabaseProductName() {
return "Ignite Cache";
}
/** {@inheritDoc} */
- @Override public String getDatabaseProductVersion() throws SQLException {
+ @Override public String getDatabaseProductVersion() {
return "4.1.0";
}
/** {@inheritDoc} */
- @Override public String getDriverName() throws SQLException {
+ @Override public String getDriverName() {
return "Ignite JDBC Driver";
}
/** {@inheritDoc} */
- @Override public String getDriverVersion() throws SQLException {
+ @Override public String getDriverVersion() {
return "1.0";
}
@@ -141,517 +141,517 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public boolean usesLocalFiles() throws SQLException {
+ @Override public boolean usesLocalFiles() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean usesLocalFilePerTable() throws SQLException {
+ @Override public boolean usesLocalFilePerTable() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsMixedCaseIdentifiers() throws SQLException {
+ @Override public boolean supportsMixedCaseIdentifiers() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean storesUpperCaseIdentifiers() throws SQLException {
+ @Override public boolean storesUpperCaseIdentifiers() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean storesLowerCaseIdentifiers() throws SQLException {
+ @Override public boolean storesLowerCaseIdentifiers() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean storesMixedCaseIdentifiers() throws SQLException {
+ @Override public boolean storesMixedCaseIdentifiers() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
+ @Override public boolean supportsMixedCaseQuotedIdentifiers() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
+ @Override public boolean storesUpperCaseQuotedIdentifiers() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
+ @Override public boolean storesLowerCaseQuotedIdentifiers() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
+ @Override public boolean storesMixedCaseQuotedIdentifiers() {
return false;
}
/** {@inheritDoc} */
- @Override public String getIdentifierQuoteString() throws SQLException {
- return " ";
+ @Override public String getIdentifierQuoteString() {
+ return "\"";
}
/** {@inheritDoc} */
- @Override public String getSQLKeywords() throws SQLException {
- return "";
+ @Override public String getSQLKeywords() {
+ return "LIMIT,MINUS,ROWNUM,SYSDATE,SYSTIME,SYSTIMESTAMP,TODAY";
}
/** {@inheritDoc} */
- @Override public String getNumericFunctions() throws SQLException {
+ @Override public String getNumericFunctions() {
return "";
}
/** {@inheritDoc} */
- @Override public String getStringFunctions() throws SQLException {
+ @Override public String getStringFunctions() {
return "";
}
/** {@inheritDoc} */
- @Override public String getSystemFunctions() throws SQLException {
+ @Override public String getSystemFunctions() {
return "";
}
/** {@inheritDoc} */
- @Override public String getTimeDateFunctions() throws SQLException {
+ @Override public String getTimeDateFunctions() {
return "";
}
/** {@inheritDoc} */
- @Override public String getSearchStringEscape() throws SQLException {
- return "";
+ @Override public String getSearchStringEscape() {
+ return "\\";
}
/** {@inheritDoc} */
- @Override public String getExtraNameCharacters() throws SQLException {
+ @Override public String getExtraNameCharacters() {
return "";
}
/** {@inheritDoc} */
- @Override public boolean supportsAlterTableWithAddColumn() throws SQLException {
+ @Override public boolean supportsAlterTableWithAddColumn() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsAlterTableWithDropColumn() throws SQLException {
+ @Override public boolean supportsAlterTableWithDropColumn() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsColumnAliasing() throws SQLException {
+ @Override public boolean supportsColumnAliasing() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean nullPlusNonNullIsNull() throws SQLException {
+ @Override public boolean nullPlusNonNullIsNull() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsConvert() throws SQLException {
- return false;
+ @Override public boolean supportsConvert() {
+ return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsConvert(int fromType, int toType) throws SQLException {
- return false;
+ @Override public boolean supportsConvert(int fromType, int toType) {
+ return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsTableCorrelationNames() throws SQLException {
+ @Override public boolean supportsTableCorrelationNames() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsDifferentTableCorrelationNames() throws SQLException {
+ @Override public boolean supportsDifferentTableCorrelationNames() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsExpressionsInOrderBy() throws SQLException {
+ @Override public boolean supportsExpressionsInOrderBy() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsOrderByUnrelated() throws SQLException {
+ @Override public boolean supportsOrderByUnrelated() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsGroupBy() throws SQLException {
+ @Override public boolean supportsGroupBy() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsGroupByUnrelated() throws SQLException {
+ @Override public boolean supportsGroupByUnrelated() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsGroupByBeyondSelect() throws SQLException {
+ @Override public boolean supportsGroupByBeyondSelect() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsLikeEscapeClause() throws SQLException {
+ @Override public boolean supportsLikeEscapeClause() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsMultipleResultSets() throws SQLException {
+ @Override public boolean supportsMultipleResultSets() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsMultipleTransactions() throws SQLException {
+ @Override public boolean supportsMultipleTransactions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsNonNullableColumns() throws SQLException {
+ @Override public boolean supportsNonNullableColumns() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsMinimumSQLGrammar() throws SQLException {
+ @Override public boolean supportsMinimumSQLGrammar() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsCoreSQLGrammar() throws SQLException {
- return false;
+ @Override public boolean supportsCoreSQLGrammar() {
+ return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsExtendedSQLGrammar() throws SQLException {
+ @Override public boolean supportsExtendedSQLGrammar() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsANSI92EntryLevelSQL() throws SQLException {
+ @Override public boolean supportsANSI92EntryLevelSQL() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsANSI92IntermediateSQL() throws SQLException {
+ @Override public boolean supportsANSI92IntermediateSQL() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsANSI92FullSQL() throws SQLException {
+ @Override public boolean supportsANSI92FullSQL() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsIntegrityEnhancementFacility() throws SQLException {
+ @Override public boolean supportsIntegrityEnhancementFacility() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsOuterJoins() throws SQLException {
+ @Override public boolean supportsOuterJoins() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsFullOuterJoins() throws SQLException {
- return true;
+ @Override public boolean supportsFullOuterJoins() {
+ return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsLimitedOuterJoins() throws SQLException {
+ @Override public boolean supportsLimitedOuterJoins() {
return true;
}
/** {@inheritDoc} */
- @Override public String getSchemaTerm() throws SQLException {
+ @Override public String getSchemaTerm() {
return "";
}
/** {@inheritDoc} */
- @Override public String getProcedureTerm() throws SQLException {
+ @Override public String getProcedureTerm() {
return "";
}
/** {@inheritDoc} */
- @Override public String getCatalogTerm() throws SQLException {
+ @Override public String getCatalogTerm() {
return "";
}
/** {@inheritDoc} */
- @Override public boolean isCatalogAtStart() throws SQLException {
+ @Override public boolean isCatalogAtStart() {
return false;
}
/** {@inheritDoc} */
- @Override public String getCatalogSeparator() throws SQLException {
+ @Override public String getCatalogSeparator() {
return "";
}
/** {@inheritDoc} */
- @Override public boolean supportsSchemasInDataManipulation() throws SQLException {
- return false;
+ @Override public boolean supportsSchemasInDataManipulation() {
+ return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsSchemasInProcedureCalls() throws SQLException {
+ @Override public boolean supportsSchemasInProcedureCalls() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsSchemasInTableDefinitions() throws SQLException {
+ @Override public boolean supportsSchemasInTableDefinitions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsSchemasInIndexDefinitions() throws SQLException {
+ @Override public boolean supportsSchemasInIndexDefinitions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
+ @Override public boolean supportsSchemasInPrivilegeDefinitions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsCatalogsInDataManipulation() throws SQLException {
+ @Override public boolean supportsCatalogsInDataManipulation() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsCatalogsInProcedureCalls() throws SQLException {
+ @Override public boolean supportsCatalogsInProcedureCalls() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsCatalogsInTableDefinitions() throws SQLException {
+ @Override public boolean supportsCatalogsInTableDefinitions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
+ @Override public boolean supportsCatalogsInIndexDefinitions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
+ @Override public boolean supportsCatalogsInPrivilegeDefinitions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsPositionedDelete() throws SQLException {
+ @Override public boolean supportsPositionedDelete() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsPositionedUpdate() throws SQLException {
+ @Override public boolean supportsPositionedUpdate() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsSelectForUpdate() throws SQLException {
+ @Override public boolean supportsSelectForUpdate() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsStoredProcedures() throws SQLException {
+ @Override public boolean supportsStoredProcedures() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsSubqueriesInComparisons() throws SQLException {
+ @Override public boolean supportsSubqueriesInComparisons() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsSubqueriesInExists() throws SQLException {
+ @Override public boolean supportsSubqueriesInExists() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsSubqueriesInIns() throws SQLException {
+ @Override public boolean supportsSubqueriesInIns() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsSubqueriesInQuantifieds() throws SQLException {
+ @Override public boolean supportsSubqueriesInQuantifieds() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsCorrelatedSubqueries() throws SQLException {
+ @Override public boolean supportsCorrelatedSubqueries() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsUnion() throws SQLException {
+ @Override public boolean supportsUnion() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsUnionAll() throws SQLException {
+ @Override public boolean supportsUnionAll() {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
+ @Override public boolean supportsOpenCursorsAcrossCommit() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
+ @Override public boolean supportsOpenCursorsAcrossRollback() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
+ @Override public boolean supportsOpenStatementsAcrossCommit() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
+ @Override public boolean supportsOpenStatementsAcrossRollback() {
return false;
}
/** {@inheritDoc} */
- @Override public int getMaxBinaryLiteralLength() throws SQLException {
+ @Override public int getMaxBinaryLiteralLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxCharLiteralLength() throws SQLException {
+ @Override public int getMaxCharLiteralLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxColumnNameLength() throws SQLException {
+ @Override public int getMaxColumnNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxColumnsInGroupBy() throws SQLException {
+ @Override public int getMaxColumnsInGroupBy() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxColumnsInIndex() throws SQLException {
+ @Override public int getMaxColumnsInIndex() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxColumnsInOrderBy() throws SQLException {
+ @Override public int getMaxColumnsInOrderBy() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxColumnsInSelect() throws SQLException {
+ @Override public int getMaxColumnsInSelect() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxColumnsInTable() throws SQLException {
+ @Override public int getMaxColumnsInTable() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxConnections() throws SQLException {
+ @Override public int getMaxConnections() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxCursorNameLength() throws SQLException {
+ @Override public int getMaxCursorNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxIndexLength() throws SQLException {
+ @Override public int getMaxIndexLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxSchemaNameLength() throws SQLException {
+ @Override public int getMaxSchemaNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxProcedureNameLength() throws SQLException {
+ @Override public int getMaxProcedureNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxCatalogNameLength() throws SQLException {
+ @Override public int getMaxCatalogNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxRowSize() throws SQLException {
+ @Override public int getMaxRowSize() {
return 0;
}
/** {@inheritDoc} */
- @Override public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
+ @Override public boolean doesMaxRowSizeIncludeBlobs() {
return false;
}
/** {@inheritDoc} */
- @Override public int getMaxStatementLength() throws SQLException {
+ @Override public int getMaxStatementLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxStatements() throws SQLException {
+ @Override public int getMaxStatements() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxTableNameLength() throws SQLException {
+ @Override public int getMaxTableNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxTablesInSelect() throws SQLException {
+ @Override public int getMaxTablesInSelect() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getMaxUserNameLength() throws SQLException {
+ @Override public int getMaxUserNameLength() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getDefaultTransactionIsolation() throws SQLException {
+ @Override public int getDefaultTransactionIsolation() {
return TRANSACTION_NONE;
}
/** {@inheritDoc} */
- @Override public boolean supportsTransactions() throws SQLException {
+ @Override public boolean supportsTransactions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsTransactionIsolationLevel(int level) throws SQLException {
+ @Override public boolean supportsTransactionIsolationLevel(int level) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException {
+ @Override public boolean supportsDataDefinitionAndDataManipulationTransactions() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsDataManipulationTransactionsOnly() throws SQLException {
+ @Override public boolean supportsDataManipulationTransactionsOnly() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
+ @Override public boolean dataDefinitionCausesTransactionCommit() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
+ @Override public boolean dataDefinitionIgnoredInTransactions() {
return false;
}
@@ -697,12 +697,16 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
List<List<?>> rows = new LinkedList<>();
- if (tblTypes == null || Arrays.asList(tblTypes).contains("TABLE"))
- for (Map.Entry<String, Map<String, Map<String, String>>> schema : meta.entrySet())
- if (matches(schema.getKey(), schemaPtrn))
- for (String tbl : schema.getValue().keySet())
+ if (validCatalogPattern(catalog) && (tblTypes == null || Arrays.asList(tblTypes).contains("TABLE"))) {
+ for (Map.Entry<String, Map<String, Map<String, String>>> schema : meta.entrySet()) {
+ if (matches(schema.getKey(), schemaPtrn)) {
+ for (String tbl : schema.getValue().keySet()) {
if (matches(tbl, tblNamePtrn))
rows.add(tableRow(schema.getKey(), tbl));
+ }
+ }
+ }
+ }
return new JdbcResultSet(null,
conn.createStatement0(),
@@ -775,14 +779,21 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
int cnt = 0;
- for (Map.Entry<String, Map<String, Map<String, String>>> schema : meta.entrySet())
- if (matches(schema.getKey(), schemaPtrn))
- for (Map.Entry<String, Map<String, String>> tbl : schema.getValue().entrySet())
- if (matches(tbl.getKey(), tblNamePtrn))
- for (Map.Entry<String, String> col : tbl.getValue().entrySet())
- rows.add(columnRow(schema.getKey(), tbl.getKey(), col.getKey(),
- JdbcUtils.type(col.getValue()), JdbcUtils.typeName(col.getValue()),
- JdbcUtils.nullable(col.getKey(), col.getValue()), ++cnt));
+ if (validCatalogPattern(catalog)) {
+ for (Map.Entry<String, Map<String, Map<String, String>>> schema : meta.entrySet()) {
+ if (matches(schema.getKey(), schemaPtrn)) {
+ for (Map.Entry<String, Map<String, String>> tbl : schema.getValue().entrySet()) {
+ if (matches(tbl.getKey(), tblNamePtrn)) {
+ for (Map.Entry<String, String> col : tbl.getValue().entrySet()) {
+ rows.add(columnRow(schema.getKey(), tbl.getKey(), col.getKey(),
+ JdbcUtils.type(col.getValue()), JdbcUtils.typeName(col.getValue()),
+ JdbcUtils.nullable(col.getKey(), col.getValue()), ++cnt));
+ }
+ }
+ }
+ }
+ }
+ }
return new JdbcResultSet(null,
conn.createStatement0(),
@@ -891,17 +902,22 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public ResultSet getPrimaryKeys(String catalog, String schema, String tbl) throws SQLException {
+ @Override public ResultSet getPrimaryKeys(String catalog, String schemaPtrn, String tblNamePtrn)
+ throws SQLException {
updateMetaData();
List<List<?>> rows = new LinkedList<>();
- for (Map.Entry<String, Map<String, Map<String, String>>> s : meta.entrySet())
- if (schema == null || schema.toUpperCase().equals(s.getKey()))
- for (Map.Entry<String, Map<String, String>> t : s.getValue().entrySet())
- if (tbl == null || tbl.toUpperCase().equals(t.getKey()))
- rows.add(Arrays.<Object>asList(null, s.getKey().toUpperCase(),
- t.getKey().toUpperCase(), "_KEY", 1, "_KEY"));
+ if (validCatalogPattern(catalog)) {
+ for (Map.Entry<String, Map<String, Map<String, String>>> schema : meta.entrySet()) {
+ if (matches(schema.getKey(), schemaPtrn)) {
+ for (Map.Entry<String, Map<String, String>> tbl : schema.getValue().entrySet()) {
+ if (matches(tbl.getKey(), tblNamePtrn))
+ rows.add(Arrays.<Object>asList(null, schema.getKey(), tbl.getKey(), "_KEY", 1, "_KEY"));
+ }
+ }
+ }
+ }
return new JdbcResultSet(null,
conn.createStatement0(),
@@ -969,28 +985,30 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
Collection<List<?>> rows = new ArrayList<>(indexes.size());
- for (List<Object> idx : indexes) {
- String idxSchema = (String)idx.get(0);
- String idxTbl = (String)idx.get(1);
-
- if ((schema == null || schema.equals(idxSchema)) && (tbl == null || tbl.equals(idxTbl))) {
- List<Object> row = new ArrayList<>(13);
-
- row.add(null);
- row.add(idxSchema);
- row.add(idxTbl);
- row.add(idx.get(2));
- row.add(null);
- row.add(idx.get(3));
- row.add((int)tableIndexOther);
- row.add(idx.get(4));
- row.add(idx.get(5));
- row.add((Boolean)idx.get(6) ? "D" : "A");
- row.add(0);
- row.add(0);
- row.add(null);
-
- rows.add(row);
+ if (validCatalogPattern(catalog)) {
+ for (List<Object> idx : indexes) {
+ String idxSchema = (String)idx.get(0);
+ String idxTbl = (String)idx.get(1);
+
+ if ((schema == null || schema.equals(idxSchema)) && (tbl == null || tbl.equals(idxTbl))) {
+ List<Object> row = new ArrayList<>(13);
+
+ row.add(null);
+ row.add(idxSchema);
+ row.add(idxTbl);
+ row.add(idx.get(2));
+ row.add(null);
+ row.add(idx.get(3));
+ row.add((int)tableIndexOther);
+ row.add(idx.get(4));
+ row.add(idx.get(5));
+ row.add((Boolean)idx.get(6) ? "D" : "A");
+ row.add(0);
+ row.add(0);
+ row.add(null);
+
+ rows.add(row);
+ }
}
}
@@ -1009,62 +1027,62 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public boolean supportsResultSetType(int type) throws SQLException {
+ @Override public boolean supportsResultSetType(int type) {
return true;
}
/** {@inheritDoc} */
- @Override public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException {
+ @Override public boolean supportsResultSetConcurrency(int type, int concurrency) {
return concurrency == CONCUR_READ_ONLY;
}
/** {@inheritDoc} */
- @Override public boolean ownUpdatesAreVisible(int type) throws SQLException {
+ @Override public boolean ownUpdatesAreVisible(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean ownDeletesAreVisible(int type) throws SQLException {
+ @Override public boolean ownDeletesAreVisible(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean ownInsertsAreVisible(int type) throws SQLException {
+ @Override public boolean ownInsertsAreVisible(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean othersUpdatesAreVisible(int type) throws SQLException {
+ @Override public boolean othersUpdatesAreVisible(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean othersDeletesAreVisible(int type) throws SQLException {
+ @Override public boolean othersDeletesAreVisible(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean othersInsertsAreVisible(int type) throws SQLException {
+ @Override public boolean othersInsertsAreVisible(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean updatesAreDetected(int type) throws SQLException {
+ @Override public boolean updatesAreDetected(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean deletesAreDetected(int type) throws SQLException {
+ @Override public boolean deletesAreDetected(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean insertsAreDetected(int type) throws SQLException {
+ @Override public boolean insertsAreDetected(int type) {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsBatchUpdates() throws SQLException {
+ @Override public boolean supportsBatchUpdates() {
return true;
}
@@ -1082,27 +1100,27 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public Connection getConnection() throws SQLException {
+ @Override public Connection getConnection() {
return conn;
}
/** {@inheritDoc} */
- @Override public boolean supportsSavepoints() throws SQLException {
+ @Override public boolean supportsSavepoints() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsNamedParameters() throws SQLException {
+ @Override public boolean supportsNamedParameters() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsMultipleOpenResults() throws SQLException {
+ @Override public boolean supportsMultipleOpenResults() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsGetGeneratedKeys() throws SQLException {
+ @Override public boolean supportsGetGeneratedKeys() {
return false;
}
@@ -1146,52 +1164,52 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public boolean supportsResultSetHoldability(int holdability) throws SQLException {
+ @Override public boolean supportsResultSetHoldability(int holdability) {
return holdability == HOLD_CURSORS_OVER_COMMIT;
}
/** {@inheritDoc} */
- @Override public int getResultSetHoldability() throws SQLException {
+ @Override public int getResultSetHoldability() {
return HOLD_CURSORS_OVER_COMMIT;
}
/** {@inheritDoc} */
- @Override public int getDatabaseMajorVersion() throws SQLException {
+ @Override public int getDatabaseMajorVersion() {
return 1;
}
/** {@inheritDoc} */
- @Override public int getDatabaseMinorVersion() throws SQLException {
+ @Override public int getDatabaseMinorVersion() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getJDBCMajorVersion() throws SQLException {
+ @Override public int getJDBCMajorVersion() {
return 1;
}
/** {@inheritDoc} */
- @Override public int getJDBCMinorVersion() throws SQLException {
+ @Override public int getJDBCMinorVersion() {
return 0;
}
/** {@inheritDoc} */
- @Override public int getSQLStateType() throws SQLException {
+ @Override public int getSQLStateType() {
return 0;
}
/** {@inheritDoc} */
- @Override public boolean locatorsUpdateCopy() throws SQLException {
+ @Override public boolean locatorsUpdateCopy() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean supportsStatementPooling() throws SQLException {
+ @Override public boolean supportsStatementPooling() {
return false;
}
/** {@inheritDoc} */
- @Override public RowIdLifetime getRowIdLifetime() throws SQLException {
+ @Override public RowIdLifetime getRowIdLifetime() {
return ROWID_UNSUPPORTED;
}
@@ -1201,9 +1219,12 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
List<List<?>> rows = new ArrayList<>(meta.size());
- for (String schema : meta.keySet())
- if (matches(schema, schemaPtrn))
- rows.add(Arrays.<Object>asList(schema, null));
+ if (validCatalogPattern(catalog)) {
+ for (String schema : meta.keySet()) {
+ if (matches(schema, schemaPtrn))
+ rows.add(Arrays.<Object>asList(schema, null));
+ }
+ }
return new JdbcResultSet(null,
conn.createStatement0(),
@@ -1215,12 +1236,17 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
+ @Override public boolean supportsStoredFunctionsUsingCallSyntax() {
return false;
}
/** {@inheritDoc} */
- @Override public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
+ @Override public boolean autoCommitFailureClosesAllResultSets() {
+ return false;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean generatedKeyAlwaysReturned() {
return false;
}
@@ -1270,20 +1296,6 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @SuppressWarnings("unchecked")
- @Override public <T> T unwrap(Class<T> iface) throws SQLException {
- if (!isWrapperFor(iface))
- throw new SQLException("Database meta data is not a wrapper for " + iface.getName());
-
- return (T)this;
- }
-
- /** {@inheritDoc} */
- @Override public boolean isWrapperFor(Class<?> iface) throws SQLException {
- return iface != null && iface == DatabaseMetaData.class;
- }
-
- /** {@inheritDoc} */
@Override public ResultSet getPseudoColumns(String catalog, String schemaPtrn, String tblNamePtrn,
String colNamePtrn) throws SQLException {
return new JdbcResultSet(null,
@@ -1297,8 +1309,17 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
}
/** {@inheritDoc} */
- @Override public boolean generatedKeyAlwaysReturned() throws SQLException {
- return false;
+ @SuppressWarnings("unchecked")
+ @Override public <T> T unwrap(Class<T> iface) throws SQLException {
+ if (!isWrapperFor(iface))
+ throw new SQLException("Database meta data is not a wrapper for " + iface.getName());
+
+ return (T)this;
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean isWrapperFor(Class<?> iface) {
+ return iface != null && iface == DatabaseMetaData.class;
}
/**
@@ -1344,7 +1365,7 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
for (String field : idx.fields()) {
indexes.add(F.<Object>asList(name, type.toUpperCase(), !idx.unique(),
- idx.name().toUpperCase(), ++cnt, field, idx.descending(field)));
+ idx.name(), ++cnt, field, idx.descending(field)));
}
}
}
@@ -1364,9 +1385,20 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData {
* @param ptrn Pattern.
* @return Whether string matches pattern.
*/
- private boolean matches(String str, String ptrn) {
+ private static boolean matches(String str, String ptrn) {
return str != null && (ptrn == null ||
- str.toUpperCase().matches(ptrn.toUpperCase().replace("%", ".*").replace("_", ".")));
+ str.matches(ptrn.replace("%", ".*").replace("_", ".")));
+ }
+
+ /**
+ * Checks whether pattern matches any catalog.
+ *
+ * @param catalog Catalog pattern.
+ * @return {@code true} If patter is valid for Ignite (null, empty, or '%' wildcard).
+ * Otherwise returns {@code false}.
+ */
+ private static boolean validCatalogPattern(String catalog) {
+ return F.isEmpty(catalog) || "%".equals(catalog);
}
/**