IGNITE-6297: JDBC: improved driver name. This closes #2613.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b10117db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b10117db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b10117db Branch: refs/heads/ignite-3484 Commit: b10117db2d2b8b99a14211a0d6a76b943e2346f3 Parents: aa17257 Author: devozerov <[email protected]> Authored: Thu Sep 7 16:50:06 2017 +0300 Committer: devozerov <[email protected]> Committed: Thu Sep 7 16:50:06 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java | 2 +- .../ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java | 5 ++++- .../org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b10117db/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 a8611b9..6020a3a 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 @@ -403,7 +403,7 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest { public void testVersions() throws Exception { try (Connection conn = DriverManager.getConnection(BASE_URL)) { assertEquals("Apache Ignite", conn.getMetaData().getDatabaseProductName()); - assertEquals("Ignite JDBC Driver", conn.getMetaData().getDriverName()); + assertEquals(JdbcDatabaseMetadata.DRIVER_NAME, conn.getMetaData().getDriverName()); assertEquals(IgniteVersionUtils.VER.toString(), conn.getMetaData().getDatabaseProductVersion()); assertEquals(IgniteVersionUtils.VER.toString(), conn.getMetaData().getDriverVersion()); assertEquals(IgniteVersionUtils.VER.major(), conn.getMetaData().getDatabaseMajorVersion()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b10117db/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java ---------------------------------------------------------------------- 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 b27fee6..1f20bb2 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 @@ -54,6 +54,9 @@ import static java.sql.RowIdLifetime.ROWID_UNSUPPORTED; */ @SuppressWarnings("RedundantCast") public class JdbcThinDatabaseMetadata implements DatabaseMetaData { + /** Driver name. */ + public static final String DRIVER_NAME = "Apache Ignite Thin JDBC Driver"; + /** Connection. */ private final JdbcThinConnection conn; @@ -121,7 +124,7 @@ public class JdbcThinDatabaseMetadata implements DatabaseMetaData { /** {@inheritDoc} */ @Override public String getDriverName() throws SQLException { - return "Ignite JDBC Thin Driver"; + return DRIVER_NAME; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b10117db/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 1ccdbcd..f4bb799 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 @@ -50,6 +50,9 @@ import static java.sql.RowIdLifetime.ROWID_UNSUPPORTED; * JDBC database metadata implementation. */ public class JdbcDatabaseMetadata implements DatabaseMetaData { + /** Driver name. */ + public static final String DRIVER_NAME = "Apache Ignite JDBC Driver"; + /** Connection. */ private final JdbcConnection conn; @@ -133,7 +136,7 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData { /** {@inheritDoc} */ @Override public String getDriverName() { - return "Ignite JDBC Driver"; + return DRIVER_NAME; } /** {@inheritDoc} */
