accept url and fk action fix from Kris Jurka

2 files changed, 36 insertions, 2 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
index 4dc8a656a35..0e7ab5862be 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
@@ -9,7 +9,7 @@ import java.sql.*;
  *
  * PS: Do you know how difficult it is to type on a train? ;-)
  *
- * $Id: DatabaseMetaDataTest.java,v 1.18 2003/05/29 04:39:48 barry Exp $
+ * $Id: DatabaseMetaDataTest.java,v 1.19 2003/11/03 15:22:07 davec Exp $
  */
 
 public class DatabaseMetaDataTest extends TestCase
@@ -137,6 +137,38 @@ public class DatabaseMetaDataTest extends TestCase
 			fail(ex.getMessage());
 		}
 	}
+
+	public void testForeignKeyActions()
+	{
+		try {
+			Connection conn = TestUtil.openDB();
+			TestUtil.createTable(conn, "pkt", "id int primary key");
+			TestUtil.createTable(conn, "fkt1", "id int references pkt on update restrict on delete cascade");
+			TestUtil.createTable(conn, "fkt2", "id int references pkt on update set null on delete set default");
+			DatabaseMetaData dbmd = conn.getMetaData();
+
+			ResultSet rs = dbmd.getImportedKeys(null,"","fkt1");
+			assertTrue(rs.next());
+			assertTrue(rs.getInt("UPDATE_RULE") == DatabaseMetaData.importedKeyRestrict);
+			assertTrue(rs.getInt("DELETE_RULE") == DatabaseMetaData.importedKeyCascade);
+			rs.close();
+
+			rs = dbmd.getImportedKeys(null,"","fkt2");
+			assertTrue(rs.next());
+			assertTrue(rs.getInt("UPDATE_RULE") == DatabaseMetaData.importedKeySetNull);
+			assertTrue(rs.getInt("DELETE_RULE") == DatabaseMetaData.importedKeySetDefault);
+			rs.close();
+
+			TestUtil.dropTable(conn,"fkt2");
+			TestUtil.dropTable(conn,"fkt1");
+			TestUtil.dropTable(conn,"pkt");
+		}
+		catch (SQLException ex)
+		{
+			fail(ex.getMessage());
+		}
+	}
+
 	public void testForeignKeys()
 	{
 		try
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
index d8e0ca56ef4..0c999eb21b1 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DriverTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import java.sql.*;
 
 /*
- * $Id: DriverTest.java,v 1.5 2002/08/14 20:35:40 barry Exp $
+ * $Id: DriverTest.java,v 1.6 2003/11/03 15:22:07 davec Exp $
  *
  * Tests the dynamically created class org.postgresql.Driver
  *
@@ -37,10 +37,12 @@ public class DriverTest extends TestCase
 			assertTrue(drv.acceptsURL("jdbc:postgresql://localhost:5432/test"));
 			assertTrue(drv.acceptsURL("jdbc:postgresql://127.0.0.1/anydbname"));
 			assertTrue(drv.acceptsURL("jdbc:postgresql://127.0.0.1:5433/hidden"));
+			assertTrue(drv.acceptsURL("jdbc:postgresql://[::1]:5740/db"));
 
 			// Badly formatted url's
 			assertTrue(!drv.acceptsURL("jdbc:postgres:test"));
 			assertTrue(!drv.acceptsURL("postgresql:test"));
+			assertTrue(!drv.acceptsURL("db"));
 
 		}
 		catch (SQLException ex)