Bug #33814823 JDBC: Error thrown on MySQL_ConnectionMetaData::getCrossReference()

Fix the getCrossReference() , getDriverName() and getImportedKeys() on MySQL_ConnectionMetaData class
so that we filter elements on join and not on where clause.

Change-Id: I92f2501064b1b333b393bc20c2196996433c59b1

Author: silvakid

driver/mysql_metadata.cpp

@@ -2201,10 +2201,11 @@ MySQL_ConnectionMetaData::getCrossReference(const sql::SQLString& primaryCatalog
            " TABLE_NAME = A.REFERENCED_TABLE_NAME AND CONSTRAINT_TYPE IN ('UNIQUE','PRIMARY KEY') LIMIT 1) AS PK_NAME,");
     query.append(importedKeyNotDeferrableStr);
     query.append(" AS DEFERRABILITY  FROM\nINFORMATION_SCHEMA.KEY_COLUMN_USAGE A JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS B\n"
-           "USING (TABLE_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)\n");
+                 "ON (A.TABLE_SCHEMA = B.TABLE_SCHEMA AND A.TABLE_NAME = B.TABLE_NAME AND A.CONSTRAINT_NAME = B.CONSTRAINT_NAME AND\n"
+                 "B.CONSTRAINT_TYPE = 'FOREIGN KEY' AND A.REFERENCED_TABLE_SCHEMA LIKE ? AND A.REFERENCED_TABLE_NAME=?\n"
+                 "AND A.TABLE_SCHEMA LIKE ? AND A.TABLE_NAME=?)\n");
     query.append(OptionalRefConstraintJoinStr);
-    query.append("\nWHERE B.CONSTRAINT_TYPE = 'FOREIGN KEY' AND A.REFERENCED_TABLE_SCHEMA LIKE ? AND A.REFERENCED_TABLE_NAME=?\n"
-           "AND A.TABLE_SCHEMA LIKE ? AND A.TABLE_NAME=?\nORDER BY  A.TABLE_SCHEMA, A.TABLE_NAME, A.ORDINAL_POSITION");
+    query.append("\nORDER BY A.TABLE_SCHEMA, A.TABLE_NAME, A.ORDINAL_POSITION");
 
     boost::scoped_ptr< sql::PreparedStatement > pStmt(connection->prepareStatement(query));
     pStmt->setString(1, primarySchema);
@@ -2435,11 +2436,11 @@ MySQL_ConnectionMetaData::getExportedKeys(const sql::SQLString& catalog, const s
            "(SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_SCHEMA = REFERENCED_TABLE_SCHEMA AND"
            " TABLE_NAME = A.REFERENCED_TABLE_NAME AND CONSTRAINT_TYPE IN ('UNIQUE','PRIMARY KEY') LIMIT 1) AS PK_NAME,");
     query.append(importedKeyNotDeferrableStr);
-    query.append(" AS DEFERRABILITY \n FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE A JOIN  INFORMATION_SCHEMA.TABLE_CONSTRAINTS B\n"
-           "USING (TABLE_SCHEMA, TABLE_NAME, CONSTRAINT_NAME)\n");
+    query.append(" AS DEFERRABILITY  FROM\nINFORMATION_SCHEMA.KEY_COLUMN_USAGE A JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS B\n"
+                 "ON (A.TABLE_SCHEMA = B.TABLE_SCHEMA AND A.TABLE_NAME = B.TABLE_NAME AND A.CONSTRAINT_NAME=B.CONSTRAINT_NAME AND\n"
+                 "B.CONSTRAINT_TYPE = 'FOREIGN KEY' AND A.REFERENCED_TABLE_SCHEMA LIKE ? AND A.REFERENCED_TABLE_NAME=?)\n");
     query.append(OptionalRefConstraintJoinStr);
-    query.append("\nWHERE B.CONSTRAINT_TYPE = 'FOREIGN KEY' AND A.REFERENCED_TABLE_SCHEMA LIKE ? AND A.REFERENCED_TABLE_NAME=?\n"
-            "ORDER BY A.TABLE_SCHEMA, A.TABLE_NAME, A.ORDINAL_POSITION");
+    query.append("ORDER BY A.TABLE_SCHEMA, A.TABLE_NAME, A.ORDINAL_POSITION\n");
 
     boost::scoped_ptr< sql::PreparedStatement > pStmt(connection->prepareStatement(query));
     pStmt->setString(1, schema);
@@ -2723,11 +2724,12 @@ MySQL_ConnectionMetaData::getImportedKeys(const sql::SQLString& catalog, const s
           "AND CONSTRAINT_TYPE IN ('UNIQUE','PRIMARY KEY') LIMIT 1) AS PK_NAME,\n");
     query.append(importedKeyNotDeferrableStr);
     query.append(" AS DEFERRABILITY FROM "
-          "INFORMATION_SCHEMA.KEY_COLUMN_USAGE A JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS B \n"
-          "USING(CONSTRAINT_NAME, TABLE_NAME) \n");
+                 "INFORMATION_SCHEMA.KEY_COLUMN_USAGE A JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS B \n"
+                 "ON(A.CONSTRAINT_NAME = B.CONSTRAINT_NAME AND A.TABLE_NAME = B.TABLE_NAME AND \n"
+                 "B.CONSTRAINT_TYPE = 'FOREIGN KEY' AND A.TABLE_SCHEMA LIKE ?  AND A.TABLE_NAME=?  AND\n"
+                 "A.REFERENCED_TABLE_SCHEMA IS NOT NULL) \n");
     query.append(OptionalRefConstraintJoinStr);
-    query.append("WHERE B.CONSTRAINT_TYPE = 'FOREIGN KEY' AND A.TABLE_SCHEMA LIKE ?  AND A.TABLE_NAME=?  AND A.REFERENCED_TABLE_SCHEMA \n"
-          "IS NOT NULL\nORDER BY A.REFERENCED_TABLE_SCHEMA, A.REFERENCED_TABLE_NAME, A.ORDINAL_POSITION");
+    query.append("\nORDER BY A.REFERENCED_TABLE_SCHEMA, A.REFERENCED_TABLE_NAME, A.ORDINAL_POSITION");
 
     boost::scoped_ptr< sql::PreparedStatement > pStmt(connection->prepareStatement(query));
     pStmt->setString(1, schema);