This is an automated email from the ASF dual-hosted git repository. johnmcdonnell pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 36ece56 [NETBEANS-2418][NETBEANS-2298] update suggested MySQL Driver to latest (#1421) 36ece56 is described below commit 36ece565eeb898bd400ed1ef8404cd0ccf586023 Author: John McDonnell <mcdonnell.j...@gmail.com> AuthorDate: Sun Aug 18 15:06:00 2019 +0100 [NETBEANS-2418][NETBEANS-2298] update suggested MySQL Driver to latest (#1421) --- .../src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java | 2 +- .../netbeans/modules/j2ee/sun/sunresources/beans/DatabaseUtils.java | 2 +- ide/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml | 2 +- .../src/org/netbeans/modules/db/mysql/impl/MySQLOptions.java | 2 +- .../src/org/netbeans/modules/db/mysql/util/DatabaseUtils.java | 2 +- ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java | 4 +++- ide/db/src/org/netbeans/modules/db/explorer/dlg/Bundle.properties | 2 +- ide/db/src/org/netbeans/modules/db/util/DriverListUtil.java | 4 ++-- ide/db/test/unit/src/org/netbeans/modules/db/test/DBTestBase.java | 3 ++- .../unit/src/org/netbeans/modules/db/util/DriverListUtilTest.java | 6 +++--- .../src/org/netbeans/modules/dbschema/test/dbsupport/DbSupport.java | 6 ++++-- .../modules/j2ee/persistence/editor/completion/Bundle.properties | 4 ++-- 12 files changed, 22 insertions(+), 17 deletions(-) diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java index 5c61bea..3fe0913 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/DriverMaps.java @@ -174,7 +174,7 @@ public class DriverMaps { //driverMap.put("jdbc:microsoft:sqlserver:", "com.microsoft.jdbc.sqlserver.SQLServerDriver"); driverMap.put("jdbc:sqlserver:", "com.microsoft.sqlserver.jdbc.SQLServerDriver"); //NOI18N //MySQL (Connector/J driver) - driverMap.put("jdbc:mysql:", "com.mysql.jdbc.Driver"); + driverMap.put("jdbc:mysql:", "com.mysql.cj.jdbc.Driver"); //MySQL (MM.MySQL driver) //driverMap.put("jdbc:mysql:", "org.gjt.mm.mysql.Driver"); diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/sunresources/beans/DatabaseUtils.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/sunresources/beans/DatabaseUtils.java index 1e2cff4..7c82ae6 100644 --- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/sunresources/beans/DatabaseUtils.java +++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/sunresources/beans/DatabaseUtils.java @@ -178,7 +178,7 @@ public class DatabaseUtils { //driverMap.put("jdbc:microsoft:sqlserver:", "com.microsoft.jdbc.sqlserver.SQLServerDriver"); driverMap.put("jdbc:sqlserver:", "com.microsoft.sqlserver.jdbc.SQLServerDriver"); //NOI18N //MySQL (Connector/J driver) - driverMap.put("jdbc:mysql:", "com.mysql.jdbc.Driver"); + driverMap.put("jdbc:mysql:", "com.mysql.cj.jdbc.Driver"); //MySQL (MM.MySQL driver) //driverMap.put("jdbc:mysql:", "org.gjt.mm.mysql.Driver"); diff --git a/ide/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml b/ide/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml index 5429ec7..ff85daf 100644 --- a/ide/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml +++ b/ide/db.drivers/src/org/netbeans/modules/db/drivers/mysql.xml @@ -23,5 +23,5 @@ <driver> <name value='MySQL'/> <display-name value='MySQL (Connector/J driver)'/> - <class value='com.mysql.jdbc.Driver'/> + <class value='com.mysql.cj.jdbc.Driver'/> </driver> diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLOptions.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLOptions.java index 8216c91..730a50b 100644 --- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLOptions.java +++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/MySQLOptions.java @@ -68,7 +68,7 @@ public final class MySQLOptions { "refresh-thread-sleep-interval"; // NOI18N // Currently not modifiable... - private static final String DRIVER_CLASS = "com.mysql.jdbc.Driver"; + private static final String DRIVER_CLASS = "com.mysql.cj.jdbc.Driver"; private static final String DEFAULT_PORT = "3306"; private static final String DEFAULT_HOST = "localhost"; private static final String DEFAULT_ADMIN_USER = "root"; diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/DatabaseUtils.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/DatabaseUtils.java index 9a96fa7..3ec8387 100644 --- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/DatabaseUtils.java +++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/DatabaseUtils.java @@ -61,7 +61,7 @@ public class DatabaseUtils { private static final String SQLSTATE_CLIENT_PREFIX = "20"; // Default URL parameters private static final String DFLT_CONFIG_OPTIONS = - "?zeroDateTimeBehavior=convertToNull"; //NOI18N + "?zeroDateTimeBehavior=CONVERT_TO_NULL"; //NOI18N private static final Logger LOGGER = Logger.getLogger(DatabaseUtils.class.getName()); diff --git a/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java b/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java index ef0580f..168bfc9 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java @@ -99,7 +99,9 @@ public class DbDriverManager { if (driver != null) { // Issue XXXX - If this is MySQL, set up the connection to be // a Unicode/utf8 connection - if ( driver.getClass().getName().equals("com.mysql.jdbc.Driver") ) { // NOI18N + String driverClassName = driver.getClass().getName(); + if ("com.mysql.jdbc.Driver".equals(driverClassName) || // NOI18N + "com.mysql.cj.jdbc.Driver".equals(driverClassName)) { // NOI18N props.put("useUnicode", "true"); props.put("characterEncoding", "utf8"); } diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/Bundle.properties b/ide/db/src/org/netbeans/modules/db/explorer/dlg/Bundle.properties index 8615fef..82fb3d4 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/Bundle.properties +++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/Bundle.properties @@ -322,7 +322,7 @@ mysql.from=http://dev.mysql.com/downloads/connector/j/ oracle.driver.name.prefix=ojdbc7.jar, ojdbc7_g.jar, ojdbc7dms.jar mysql.driver.name.prefix=mysql-connector-java oracle.driver.name=ojdbc7.jar -mysql.driver.name=mysql-connector-java-5.1.13-bin.jar +mysql.driver.name=mysql-connector-java-8.0.17.jar ChoosingDriverInterUI.locateDriver=Select {0} driver ChoosingDriverInterUI.errorMessage.DriverNotFound=Specify location of {0} driver. PredefinedWizard.WizardTitle=New Connection Wizard diff --git a/ide/db/src/org/netbeans/modules/db/util/DriverListUtil.java b/ide/db/src/org/netbeans/modules/db/util/DriverListUtil.java index 1c9279e..6b83fc7 100644 --- a/ide/db/src/org/netbeans/modules/db/util/DriverListUtil.java +++ b/ide/db/src/org/netbeans/modules/db/util/DriverListUtil.java @@ -218,9 +218,9 @@ public class DriverListUtil { "jdbc:sqlserver://[<HOST>[\\<INSTANCE>][:<PORT>]][;databaseName=<DB>][;<ADDITIONAL>]", true); url = add(NbBundle.getMessage(DriverListUtil.class, "DRIVERNAME_MySQL"), - "com.mysql.jdbc.Driver", + "com.mysql.cj.jdbc.Driver", "jdbc:mysql://[<HOST>[:<PORT>]][/<DB>][?<ADDITIONAL>]", true); // NOI18N - url.setSampleUrl("jdbc:mysql://localhost:3306/mysql?zeroDateTimeBehavior=convertToNull"); + url.setSampleUrl("jdbc:mysql://localhost:3306/mysql?zeroDateTimeBehavior=CONVERT_TO_NULL"); url.setSampleUser("root"); url.setSamplePassword(""); diff --git a/ide/db/test/unit/src/org/netbeans/modules/db/test/DBTestBase.java b/ide/db/test/unit/src/org/netbeans/modules/db/test/DBTestBase.java index 22272f7..1ce59bf 100644 --- a/ide/db/test/unit/src/org/netbeans/modules/db/test/DBTestBase.java +++ b/ide/db/test/unit/src/org/netbeans/modules/db/test/DBTestBase.java @@ -321,7 +321,8 @@ public abstract class DBTestBase extends TestBase { } protected final boolean isMySQL() { - return driverClassName.equals("com.mysql.jdbc.Driver"); + return "com.mysql.jdbc.Driver".equals(driverClassName) || + "com.mysql.cj.jdbc.Driver".equals(driverClassName); } protected final void createSchema() throws Exception { diff --git a/ide/db/test/unit/src/org/netbeans/modules/db/util/DriverListUtilTest.java b/ide/db/test/unit/src/org/netbeans/modules/db/util/DriverListUtilTest.java index 61cc7b2..1c25e52 100644 --- a/ide/db/test/unit/src/org/netbeans/modules/db/util/DriverListUtilTest.java +++ b/ide/db/test/unit/src/org/netbeans/modules/db/util/DriverListUtilTest.java @@ -88,8 +88,8 @@ public class DriverListUtilTest extends TestCase { * @throws MalformedURLException */ public void testGetJdbcUrls() throws MalformedURLException { - JDBCDriver driver = JDBCDriver.create("Mysql 1", "Mysql 1", "com.mysql.jdbc.Driver", new URL[] {new URL("file://demo1")}); - JDBCDriver driver2 = JDBCDriver.create("Mysql 2", "Mysql 2", "com.mysql.jdbc.Driver", new URL[] {new URL("file://demo1")}); + JDBCDriver driver = JDBCDriver.create("Mysql 1", "Mysql 1", "com.mysql.cj.jdbc.Driver", new URL[] {new URL("file://demo1")}); + JDBCDriver driver2 = JDBCDriver.create("Mysql 2", "Mysql 2", "com.mysql.cj.jdbc.Driver", new URL[] {new URL("file://demo1")}); assertEquals(1, DriverListUtil.getJdbcUrls(driver).size()); assertEquals(1, DriverListUtil.getJdbcUrls(driver2).size()); assertEquals(1, DriverListUtil.getJdbcUrls(driver).size()); @@ -190,7 +190,7 @@ public class DriverListUtilTest extends TestCase { public void testMySQL() throws Exception { ArrayList<String> requiredProps = new ArrayList<String>(); - JdbcUrl url = checkUrl(getDriverName("DRIVERNAME_MySQL"), null, "com.mysql.jdbc.Driver", + JdbcUrl url = checkUrl(getDriverName("DRIVERNAME_MySQL"), null, "com.mysql.cj.jdbc.Driver", "jdbc:mysql://[<HOST>[:<PORT>]][/<DB>][?<ADDITIONAL>]", STD_SUPPORTED_PROPS, requiredProps); diff --git a/java/dbschema/test/unit/src/org/netbeans/modules/dbschema/test/dbsupport/DbSupport.java b/java/dbschema/test/unit/src/org/netbeans/modules/dbschema/test/dbsupport/DbSupport.java index 87b1685..c20a90a 100644 --- a/java/dbschema/test/unit/src/org/netbeans/modules/dbschema/test/dbsupport/DbSupport.java +++ b/java/dbschema/test/unit/src/org/netbeans/modules/dbschema/test/dbsupport/DbSupport.java @@ -32,7 +32,8 @@ public abstract class DbSupport { public enum FEATURE { SEQUENCE, AUTOINCREMENT } ; public static VENDOR getVendor(String driverClass) { - if ( "com.mysql.jdbc.Driver".equals(driverClass)) { + if ( "com.mysql.jdbc.Driver".equals(driverClass) + || "com.mysql.cj.jdbc.Driver".equals(driverClass)) { return VENDOR.MYSQL; } else if ("org.apache.derby.jdbc.ClientDriver".equals(driverClass)) { return VENDOR.JAVADB; @@ -45,7 +46,8 @@ public abstract class DbSupport { } } public static DbSupport getInstance(String driverClass) { - if ( "com.mysql.jdbc.Driver".equals(driverClass)) { + if ( "com.mysql.jdbc.Driver".equals(driverClass) + || "com.mysql.cj.jdbc.Driver".equals(driverClass)) { return MySQLDBSupport.getInstance(); } else if ("org.apache.derby.jdbc.ClientDriver".equals(driverClass)) { return JavaDbSupport.getInstance(); diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle.properties b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle.properties index 3c38b01..ae0ebef 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle.properties +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/Bundle.properties @@ -34,7 +34,7 @@ qualified class name for a valid class that implements \ <code>java.sql.Driver</code>. \ <p>\ <b>Persistence XML example:</b> <code>\ -<property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver" />\ +<property name="javax.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver" />\ </code>\ <p>\ The previous value for this property <code>"eclipselink.jdbc.driver</code> is now deprecated and should \ @@ -1310,7 +1310,7 @@ the value is a map of properties to be passed to this persistence unit. \ ) , \ ("memberPu2" -> ( "javax.persistence.jdbc.user" -> "user2", \ "javax.persistence.jdbc.password" -> "password2" \ - "javax.persistence.jdbc.driver" -> "com.mysql.jdbc.Driver", \ + "javax.persistence.jdbc.driver" -> "com.mysql.cj.jdbc.Driver", \ "javax.persistence.jdbc.url" -> "jdbc:mysql://my_sql_db_url:3306/user2", \ )\ ) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists