Skip to content

Commit c2904a9

Browse files
rusherrusher
committed
[misc] metadata DatabaseMeta.getExportedKeys() test correction
1 parent 66a51df commit c2904a9

File tree

1 file changed

+8
-34
lines changed

1 file changed

+8
-34
lines changed

‎src/test/java/org/mariadb/jdbc/integration/DatabaseMetadataTest.java‎

Lines changed: 8 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -686,13 +686,8 @@ public void exportedKeysTest() throws SQLException {
686686
assertEquals("cross2", rs.getString("FKTABLE_NAME"));
687687
assertEquals("id_ref0", rs.getString("FKCOLUMN_NAME"));
688688
assertTrue(rs.getInt("KEY_SEQ") == 1 || rs.wasNull());
689-
if (!isMariaDBServer() && minVersion(8, 0, 0)) {
690-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("UPDATE_RULE"));
691-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("DELETE_RULE"));
692-
} else {
693-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("UPDATE_RULE"));
694-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
695-
}
689+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("UPDATE_RULE"));
690+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
696691
assertEquals("cross2_ibfk_1", rs.getString("FK_NAME"));
697692
assertTrue(
698693
"PRIMARY".equals(rs.getString("PK_NAME"))
@@ -711,11 +706,7 @@ public void exportedKeysTest() throws SQLException {
711706
assertEquals("id_ref1", rs.getString("FKCOLUMN_NAME"));
712707
assertTrue(rs.getInt("KEY_SEQ") == 1 || rs.wasNull());
713708
assertEquals(DatabaseMetaData.importedKeyCascade, rs.getInt("UPDATE_RULE"));
714-
if (!isMariaDBServer() && minVersion(8, 0, 0)) {
715-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("DELETE_RULE"));
716-
} else {
717-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
718-
}
709+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
719710
assertTrue(
720711
"cross3_ibfk_1".equals(rs.getString("FK_NAME"))
721712
|| "fk_my_name".equals(rs.getString("FK_NAME")));
@@ -732,11 +723,7 @@ public void exportedKeysTest() throws SQLException {
732723
assertEquals("id_ref2", rs.getString("FKCOLUMN_NAME"));
733724
assertTrue(rs.getInt("KEY_SEQ") == 2 || rs.wasNull());
734725
assertEquals(DatabaseMetaData.importedKeyCascade, rs.getInt("UPDATE_RULE"));
735-
if (!isMariaDBServer() && minVersion(8, 0, 0)) {
736-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("DELETE_RULE"));
737-
} else {
738-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
739-
}
726+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
740727
assertTrue(
741728
"fk_my_name".equals(rs.getString("FK_NAME"))
742729
|| "cross3_ibfk_1".equals(rs.getString("FK_NAME")));
@@ -760,13 +747,8 @@ public void exportedKeysTestSchema() throws SQLException {
760747
assertEquals("cross2", rs.getString("FKTABLE_NAME"));
761748
assertEquals("id_ref0", rs.getString("FKCOLUMN_NAME"));
762749
assertTrue(rs.getInt("KEY_SEQ") == 1 || rs.wasNull());
763-
if (!isMariaDBServer() && minVersion(8, 0, 0)) {
764-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("UPDATE_RULE"));
765-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("DELETE_RULE"));
766-
} else {
767-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("UPDATE_RULE"));
768-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
769-
}
750+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("UPDATE_RULE"));
751+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
770752
assertEquals("cross2_ibfk_1", rs.getString("FK_NAME"));
771753
assertTrue(
772754
"PRIMARY".equals(rs.getString("PK_NAME"))
@@ -786,11 +768,7 @@ public void exportedKeysTestSchema() throws SQLException {
786768
assertEquals("id_ref1", rs.getString("FKCOLUMN_NAME"));
787769
assertTrue(rs.getInt("KEY_SEQ") == 1 || rs.wasNull());
788770
assertEquals(DatabaseMetaData.importedKeyCascade, rs.getInt("UPDATE_RULE"));
789-
if (!isMariaDBServer() && minVersion(8, 0, 0)) {
790-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("DELETE_RULE"));
791-
} else {
792-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
793-
}
771+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
794772
assertTrue(
795773
"cross3_ibfk_1".equals(rs.getString("FK_NAME"))
796774
|| "fk_my_name".equals(rs.getString("FK_NAME")));
@@ -807,11 +785,7 @@ public void exportedKeysTestSchema() throws SQLException {
807785
assertEquals("id_ref2", rs.getString("FKCOLUMN_NAME"));
808786
assertTrue(rs.getInt("KEY_SEQ") == 2 || rs.wasNull());
809787
assertEquals(DatabaseMetaData.importedKeyCascade, rs.getInt("UPDATE_RULE"));
810-
if (!isMariaDBServer() && minVersion(8, 0, 0)) {
811-
assertEquals(DatabaseMetaData.importedKeyNoAction, rs.getInt("DELETE_RULE"));
812-
} else {
813-
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
814-
}
788+
assertEquals(DatabaseMetaData.importedKeyRestrict, rs.getInt("DELETE_RULE"));
815789
assertTrue(
816790
"fk_my_name".equals(rs.getString("FK_NAME"))
817791
|| "cross3_ibfk_1".equals(rs.getString("FK_NAME")));

0 commit comments

Comments
 (0)