This is an automated email from the ASF dual-hosted git repository.
tledkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 513afe4 IGNITE-13403 Update JDBC metadata to match actual
capabilities (#8217)
513afe4 is described below
commit 513afe4dabbaa1c2853a76ff02e58f4a7db01076
Author: tledkov <[email protected]>
AuthorDate: Mon Sep 14 15:13:27 2020 +0300
IGNITE-13403 Update JDBC metadata to match actual capabilities (#8217)
---
.../ignite/internal/jdbc2/JdbcMetadataSelfTest.java | 15 +++++++++++++++
.../org/apache/ignite/jdbc/JdbcMetadataSelfTest.java | 16 ++++++++++++++++
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 15 +++++++++++++++
.../ignite/internal/jdbc/JdbcDatabaseMetadata.java | 8 ++++----
.../internal/jdbc/thin/JdbcThinDatabaseMetadata.java | 6 +++---
.../ignite/internal/jdbc2/JdbcDatabaseMetadata.java | 8 ++++----
6 files changed, 57 insertions(+), 11 deletions(-)
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 9c21309..dce0689 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
@@ -451,6 +451,21 @@ public class JdbcMetadataSelfTest extends
GridCommonAbstractTest {
}
/**
+ * Check JDBC support flags.
+ */
+ @Test
+ public void testCheckSupports() throws SQLException {
+ try (Connection conn = DriverManager.getConnection(BASE_URL)) {
+ DatabaseMetaData meta = conn.getMetaData();
+
+ assertTrue(meta.supportsANSI92EntryLevelSQL());
+ assertTrue(meta.supportsAlterTableWithAddColumn());
+ assertTrue(meta.supportsAlterTableWithDropColumn());
+ assertTrue(meta.nullPlusNonNullIsNull());
+ }
+ }
+
+ /**
* Assert that specified ResultSet contains no rows.
*
* @param rs result set to check.
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 82acac9..7583aa7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -25,6 +25,7 @@ import java.sql.Date;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Collection;
@@ -319,6 +320,21 @@ public class JdbcMetadataSelfTest extends
GridCommonAbstractTest {
}
/**
+ * Check JDBC support flags.
+ */
+ @Test
+ public void testCheckSupports() throws SQLException {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ DatabaseMetaData meta = conn.getMetaData();
+
+ assertTrue(meta.supportsANSI92EntryLevelSQL());
+ assertTrue(meta.supportsAlterTableWithAddColumn());
+ assertTrue(meta.supportsAlterTableWithDropColumn());
+ assertTrue(meta.nullPlusNonNullIsNull());
+ }
+ }
+
+ /**
* Person.
*/
private static class Person implements Serializable {
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index a911a1c..3061b4a 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -1370,6 +1370,21 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
}
/**
+ * Check JDBC support flags.
+ */
+ @Test
+ public void testCheckSupports() throws SQLException {
+ try (Connection conn = DriverManager.getConnection(URL)) {
+ DatabaseMetaData meta = conn.getMetaData();
+
+ assertTrue(meta.supportsANSI92EntryLevelSQL());
+ assertTrue(meta.supportsAlterTableWithAddColumn());
+ assertTrue(meta.supportsAlterTableWithDropColumn());
+ assertTrue(meta.nullPlusNonNullIsNull());
+ }
+ }
+
+ /**
* Person.
*/
private static class Person implements Serializable {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
index ad54258..a8b4650 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java
@@ -233,12 +233,12 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean supportsAlterTableWithAddColumn() throws
SQLException {
- return false;
+ return true;
}
/** {@inheritDoc} */
@Override public boolean supportsAlterTableWithDropColumn() throws
SQLException {
- return false;
+ return true;
}
/** {@inheritDoc} */
@@ -248,7 +248,7 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean nullPlusNonNullIsNull() throws SQLException {
- return false;
+ return true;
}
/** {@inheritDoc} */
@@ -333,7 +333,7 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean supportsANSI92EntryLevelSQL() throws SQLException
{
- return false;
+ return true;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java
index a59c983..5f6681f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java
@@ -249,12 +249,12 @@ public class JdbcThinDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean supportsAlterTableWithAddColumn() throws
SQLException {
- return false;
+ return true;
}
/** {@inheritDoc} */
@Override public boolean supportsAlterTableWithDropColumn() throws
SQLException {
- return false;
+ return true;
}
/** {@inheritDoc} */
@@ -264,7 +264,7 @@ public class JdbcThinDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean nullPlusNonNullIsNull() throws SQLException {
- return false;
+ return true;
}
/** {@inheritDoc} */
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 1f22563..4782c59 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
@@ -254,12 +254,12 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean supportsAlterTableWithAddColumn() {
- return false;
+ return true;
}
/** {@inheritDoc} */
@Override public boolean supportsAlterTableWithDropColumn() {
- return false;
+ return true;
}
/** {@inheritDoc} */
@@ -269,7 +269,7 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean nullPlusNonNullIsNull() {
- return false;
+ return true;
}
/** {@inheritDoc} */
@@ -354,7 +354,7 @@ public class JdbcDatabaseMetadata implements
DatabaseMetaData {
/** {@inheritDoc} */
@Override public boolean supportsANSI92EntryLevelSQL() {
- return false;
+ return true;
}
/** {@inheritDoc} */
