testing for insertRow

1 files changed, 71 insertions, 70 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java
index 8fd45c29f04..d6324a3e992 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/UpdateableResultTest.java
@@ -23,47 +23,48 @@ public class UpdateableResultTest extends TestCase
 
   public void testUpdateable()
   {
-		try
-		{
-			Connection con = TestUtil.openDB();
+    try
+    {
+      Connection con = TestUtil.openDB();
       TestUtil.createTable(con, "updateable","id int primary key, name text, notselected text");
       TestUtil.createTable(con, "second","id1 int primary key, name1 text");
-      Statement st1 = con.createStatement();
-      boolean retVal = st1.execute( "insert into updateable ( id, name, notselected ) values (1, 'jake', 'avalue')" );
-      assertTrue(!retVal);
 
-      retVal = st1.execute( "insert into second (id1, name1) values (1, 'jake')" );
-      assertTrue( !retVal );
-      st1.close();
+      // put some dummy data into second
+      Statement st2 = con.createStatement();
+      st2.execute( "insert into second values (1,'anyvalue' )");
+      st2.close();
 
-			Statement st = con.createStatement( ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE );
-			ResultSet rs = st.executeQuery( "select id, name, notselected from updateable" );
+      Statement st = con.createStatement( ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE );
+      ResultSet rs = st.executeQuery( "select * from updateable");
+      assertNotNull( rs );
+      rs.moveToInsertRow();
+      rs.updateInt( 1, 1 );
+      rs.updateString( 2, "jake" );
+      rs.updateString( 3, "avalue" );
+      rs.insertRow();
+      rs.first();
 
-			assertNotNull(rs);
+      rs.updateInt( "id",2 );
+      rs.updateString( "name","dave" );
+      rs.updateRow();
 
-			while (rs.next())
-			{
-        rs.updateInt( "id",2 );
-				rs.updateString( "name","dave" );
-        rs.updateRow();
-        assertTrue( rs.getInt("id") == 2 );
-        assertTrue( rs.getString("name").equals("dave"));
-        assertTrue( rs.getString("notselected").equals("avalue") );
+      assertTrue( rs.getInt("id") == 2 );
+      assertTrue( rs.getString("name").equals("dave"));
+      assertTrue( rs.getString("notselected").equals("avalue") );
 
-        rs.deleteRow();
-        rs.moveToInsertRow();
-        rs.updateInt("id",3);
-        rs.updateString("name", "paul");
+      rs.deleteRow();
+      rs.moveToInsertRow();
+      rs.updateInt("id",3);
+      rs.updateString("name", "paul");
 
-        rs.insertRow();
-        rs.refreshRow();
-        assertTrue( rs.getInt("id") == 3 );
-        assertTrue( rs.getString("name").equals("paul"));
-        assertTrue( rs.getString("notselected") == null );
+      rs.insertRow();
+      rs.refreshRow();
+      assertTrue( rs.getInt("id") == 3 );
+      assertTrue( rs.getString("name").equals("paul"));
+      assertTrue( rs.getString("notselected") == null );
 
-			}
 
-			rs.close();
+      rs.close();
 
       rs = st.executeQuery("select id1, id, name, name1 from updateable, second" );
       try
@@ -82,53 +83,53 @@ public class UpdateableResultTest extends TestCase
 
       try
       {
-          rs = st.executeQuery("select oid,* from updateable");
-          if ( rs.first() )
-          {
-            rs.updateInt( "id", 3 );
-            rs.updateString( "name", "dave3");
-            rs.updateRow();
-            assertTrue(rs.getInt("id") == 3 );
-            assertTrue(rs.getString("name").equals("dave3"));
-
-            rs.moveToInsertRow();
-            rs.updateInt( "id", 4 );
-            rs.updateString( "name", "dave4" );
-
-            rs.insertRow();
-            rs.updateInt("id", 5 );
-            rs.updateString( "name", "dave5" );
-            rs.insertRow();
-
-            rs.moveToCurrentRow();
-            assertTrue(rs.getInt("id") == 3 );
-            assertTrue(rs.getString("name").equals("dave3"));
-
-            assertTrue( rs.next() );
-            assertTrue(rs.getInt("id") == 4 );
-            assertTrue(rs.getString("name").equals("dave4"));
-
-            assertTrue( rs.next() );
-            assertTrue(rs.getInt("id") == 5 );
-            assertTrue(rs.getString("name").equals("dave5"));
-
-          }
+        rs = st.executeQuery("select oid,* from updateable");
+        if ( rs.first() )
+        {
+          rs.updateInt( "id", 3 );
+          rs.updateString( "name", "dave3");
+          rs.updateRow();
+          assertTrue(rs.getInt("id") == 3 );
+          assertTrue(rs.getString("name").equals("dave3"));
+
+          rs.moveToInsertRow();
+          rs.updateInt( "id", 4 );
+          rs.updateString( "name", "dave4" );
+
+          rs.insertRow();
+          rs.updateInt("id", 5 );
+          rs.updateString( "name", "dave5" );
+          rs.insertRow();
+
+          rs.moveToCurrentRow();
+          assertTrue(rs.getInt("id") == 3 );
+          assertTrue(rs.getString("name").equals("dave3"));
+
+          assertTrue( rs.next() );
+          assertTrue(rs.getInt("id") == 4 );
+          assertTrue(rs.getString("name").equals("dave4"));
+
+          assertTrue( rs.next() );
+          assertTrue(rs.getInt("id") == 5 );
+          assertTrue(rs.getString("name").equals("dave5"));
+
+        }
       }
       catch(SQLException ex)
       {
         fail(ex.getMessage());
       }
 
-			st.close();
+      st.close();
 
       TestUtil.dropTable( con,"updateable" );
-			TestUtil.closeDB( con );
-		}
-		catch (Exception ex)
-		{
-			fail(ex.getMessage());
-		}
-	}
+      TestUtil.closeDB( con );
+    }
+    catch (Exception ex)
+    {
+      fail(ex.getMessage());
+    }
+  }
 
 
 }