Fix for Bug#118938 (Bug#38396227), DatabaseMetaDataInformationSchema#getSchemas has a bug.

Change-Id: I23c758838c6ab471ed6edcf17362fa8a68e327b1

Author: fjssilva

CHANGES

@@ -3,6 +3,8 @@
 
 Version 9.5.0
 
+  - Fix for Bug#118938 (Bug#38396227), DatabaseMetaDataInformationSchema#getSchemas has a bug.
+
   - Fix for Bug#99292 (Bug#31195955), Contribution: Support Windows time zone \'Coordinated Universal Time\'.
     Thanks to Frédéric Barrière for his contribution.
 

src/main/user-impl/java/com/mysql/cj/jdbc/DatabaseMetaDataInformationSchema.java

@@ -310,6 +310,7 @@ public ResultSet getCatalogs() throws SQLException {
         if (databaseTermValue() != DatabaseTerm.CATALOG) {
             query.append(" WHERE FALSE");
         }
+        query.append(" ORDER BY TABLE_CAT");
         ResultSet rs = stmt.executeQuery(query.toString());
 
         ((com.mysql.cj.jdbc.result.ResultSetInternalMethods) rs).getColumnDefinition().setFields(createCatalogsFields());
@@ -936,7 +937,7 @@ public ResultSet getProcedures(String catalog, String schemaPattern, String proc
 
     @Override
     public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLException {
-        final String dbFromTerm = chooseDatabaseTerm(catalog, schemaPattern);
+        final String dbFromTerm = chooseDatabaseTerm(null, schemaPattern);
         final String dbFilter = normalizeIdentifierQuoting(dbFromTerm);
 
         StringBuilder query = new StringBuilder("SELECT");
@@ -945,6 +946,7 @@ public ResultSet getSchemas(String catalog, String schemaPattern) throws SQLExce
         query.append(" FROM INFORMATION_SCHEMA.SCHEMATA");
         query.append(chooseBasedOnDatabaseTerm(() -> " WHERE FALSE",
                 () -> dbFilter == null ? "" : StringUtils.hasWildcards(dbFilter) ? " WHERE SCHEMA_NAME LIKE ?" : " WHERE SCHEMA_NAME = ?"));
+        query.append(" ORDER BY TABLE_CATALOG, TABLE_SCHEM");
 
         try (PreparedStatement pStmt = prepareMetaDataSafeStatement(query.toString())) {
             if (dbFilter != null) {

src/test/java/testsuite/regression/MetaDataRegressionTest.java

@@ -20,6 +20,7 @@
 
 package testsuite.regression;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -6037,4 +6038,28 @@ public void testBug98620() throws Exception {
         } while (useIS = !useIS);
     }
 
+    /**
+     * Tests fix for Bug#118938 (Bug#38396227), DatabaseMetaDataInformationSchema#getSchemas has a bug.
+     *
+     * @throws Exception
+     */
+    @Test
+    void testBug118938() throws Exception {
+        boolean useIS = false;
+        do {
+            for (DatabaseTerm dbt : DatabaseTerm.values()) {
+                Properties props = new Properties();
+                props.setProperty(PropertyKey.useInformationSchema.getKeyName(), Boolean.toString(useIS));
+                props.setProperty(PropertyKey.databaseTerm.getKeyName(), dbt.toString());
+
+                assertDoesNotThrow(() -> {
+                    try (Connection testConn = getConnectionWithProps(props)) {
+                        DatabaseMetaData dbmd = testConn.getMetaData();
+                        dbmd.getSchemas("%", "%");
+                    }
+                }, "DatabaseMetaData.getSchemas should not throw for DatabaseTerm: " + dbt);
+            }
+        } while (useIS = !useIS);
+    }
+
 }