diff options
| author | James Moger <james.moger@gmail.com> | 2012-10-15 10:55:47 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gmail.com> | 2012-10-15 10:55:47 -0400 |
| commit | 75b3c1c1cf2203940634168e5a618b3d276fc325 (patch) | |
| tree | c2f6e4d21feb504dcd88e56366dd636b86d2e29f /tests | |
| parent | 913ac2ce21edba56cc4b620e194f4bddce4b3cb2 (diff) | |
| download | iciql-75b3c1c1cf2203940634168e5a618b3d276fc325.tar.gz iciql-75b3c1c1cf2203940634168e5a618b3d276fc325.zip | |
Fix name collissions on indexes, unique keys, and foreign keys
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/com/iciql/test/AnnotationsTest.java | 4 | ||||
| -rw-r--r-- | tests/com/iciql/test/ModelsTest.java | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/com/iciql/test/AnnotationsTest.java b/tests/com/iciql/test/AnnotationsTest.java index ad229d9..6aa75ad 100644 --- a/tests/com/iciql/test/AnnotationsTest.java +++ b/tests/com/iciql/test/AnnotationsTest.java @@ -79,8 +79,8 @@ public class AnnotationsTest { String index = rs.getString("INDEX_NAME"); list.add((col + ":" + index).toLowerCase()); } - assertTrue(list.contains("name:annotatedproduct_0")); - assertTrue(list.contains("cat:annotatedproduct_0")); + assertTrue(list.contains("name:annotatedproduct_idx_0")); + assertTrue(list.contains("cat:annotatedproduct_idx_0")); assertTrue(list.contains("name:nameidx")); } diff --git a/tests/com/iciql/test/ModelsTest.java b/tests/com/iciql/test/ModelsTest.java index ceed7a9..c5ba27a 100644 --- a/tests/com/iciql/test/ModelsTest.java +++ b/tests/com/iciql/test/ModelsTest.java @@ -123,20 +123,20 @@ public class ModelsTest { // a poor test, but a start String dbName = IciqlSuite.getDatabaseEngineName(db); if (dbName.equals("H2")) { - assertEquals(1579, models.get(0).length()); + assertEquals(1587, models.get(0).length()); } else if (dbName.startsWith("HSQL")) { // HSQL uses Double instead of Float - assertEquals(1583, models.get(0).length()); + assertEquals(1591, models.get(0).length()); } else if (dbName.equals("Apache Derby")) { // Derby uses java.sql.Timestamp not java.util.Date // Derby uses username as schema name - assertEquals(1593, models.get(0).length()); + assertEquals(1601, models.get(0).length()); } else if (dbName.equals("PostgreSQL")) { - assertEquals(1635, models.get(0).length()); + assertEquals(1643, models.get(0).length()); } else if (dbName.equals("MySQL")) { // MySQL uses timestamp default values like // 0000-00-00 00:00:00 and CURRENT_TIMESTAMP - assertEquals(1665, models.get(0).length()); + assertEquals(1673, models.get(0).length()); } else { // unknown database assertEquals(0, models.get(0).length()); |