@@ -23,47 +23,48 @@ public UpdateableResultTest( String name )
2323
2424public void testUpdateable ()
2525 {
26- try
27- {
28- Connection con =TestUtil .openDB ();
26+ try
27+ {
28+ Connection con =TestUtil .openDB ();
2929TestUtil .createTable (con ,"updateable" ,"id int primary key, name text, notselected text" );
3030TestUtil .createTable (con ,"second" ,"id1 int primary key, name1 text" );
31- Statement st1 =con .createStatement ();
32- boolean retVal =st1 .execute ("insert into updateable ( id, name, notselected ) values (1, 'jake', 'avalue')" );
33- assertTrue (!retVal );
3431
35- retVal =st1 .execute ("insert into second (id1, name1) values (1, 'jake')" );
36- assertTrue ( !retVal );
37- st1 .close ();
32+ // put some dummy data into second
33+ Statement st2 =con .createStatement ();
34+ st2 .execute ("insert into second values (1,'anyvalue' )" );
35+ st2 .close ();
3836
39- Statement st =con .createStatement (ResultSet .TYPE_SCROLL_INSENSITIVE ,ResultSet .CONCUR_UPDATABLE );
40- ResultSet rs =st .executeQuery ("select id, name, notselected from updateable" );
37+ Statement st =con .createStatement (ResultSet .TYPE_SCROLL_INSENSITIVE ,ResultSet .CONCUR_UPDATABLE );
38+ ResultSet rs =st .executeQuery ("select * from updateable" );
39+ assertNotNull (rs );
40+ rs .moveToInsertRow ();
41+ rs .updateInt (1 ,1 );
42+ rs .updateString (2 ,"jake" );
43+ rs .updateString (3 ,"avalue" );
44+ rs .insertRow ();
45+ rs .first ();
4146
42- assertNotNull (rs );
47+ rs .updateInt ("id" ,2 );
48+ rs .updateString ("name" ,"dave" );
49+ rs .updateRow ();
4350
44- while (rs .next ())
45- {
46- rs .updateInt ("id" ,2 );
47- rs .updateString ("name" ,"dave" );
48- rs .updateRow ();
49- assertTrue (rs .getInt ("id" ) ==2 );
50- assertTrue (rs .getString ("name" ).equals ("dave" ));
51- assertTrue (rs .getString ("notselected" ).equals ("avalue" ) );
51+ assertTrue (rs .getInt ("id" ) ==2 );
52+ assertTrue (rs .getString ("name" ).equals ("dave" ));
53+ assertTrue (rs .getString ("notselected" ).equals ("avalue" ) );
5254
53- rs .deleteRow ();
54- rs .moveToInsertRow ();
55- rs .updateInt ("id" ,3 );
56- rs .updateString ("name" ,"paul" );
55+ rs .deleteRow ();
56+ rs .moveToInsertRow ();
57+ rs .updateInt ("id" ,3 );
58+ rs .updateString ("name" ,"paul" );
5759
58- rs .insertRow ();
59- rs .refreshRow ();
60- assertTrue (rs .getInt ("id" ) ==3 );
61- assertTrue (rs .getString ("name" ).equals ("paul" ));
62- assertTrue (rs .getString ("notselected" ) ==null );
60+ rs .insertRow ();
61+ rs .refreshRow ();
62+ assertTrue (rs .getInt ("id" ) ==3 );
63+ assertTrue (rs .getString ("name" ).equals ("paul" ));
64+ assertTrue (rs .getString ("notselected" ) ==null );
6365
64- }
6566
66- rs .close ();
67+ rs .close ();
6768
6869rs =st .executeQuery ("select id1, id, name, name1 from updateable, second" );
6970try
@@ -82,53 +83,53 @@ public void testUpdateable()
8283
8384try
8485 {
85- rs =st .executeQuery ("select oid,* from updateable" );
86- if (rs .first () )
87- {
88- rs .updateInt ("id" ,3 );
89- rs .updateString ("name" ,"dave3" );
90- rs .updateRow ();
91- assertTrue (rs .getInt ("id" ) ==3 );
92- assertTrue (rs .getString ("name" ).equals ("dave3" ));
93-
94- rs .moveToInsertRow ();
95- rs .updateInt ("id" ,4 );
96- rs .updateString ("name" ,"dave4" );
97-
98- rs .insertRow ();
99- rs .updateInt ("id" ,5 );
100- rs .updateString ("name" ,"dave5" );
101- rs .insertRow ();
102-
103- rs .moveToCurrentRow ();
104- assertTrue (rs .getInt ("id" ) ==3 );
105- assertTrue (rs .getString ("name" ).equals ("dave3" ));
106-
107- assertTrue (rs .next () );
108- assertTrue (rs .getInt ("id" ) ==4 );
109- assertTrue (rs .getString ("name" ).equals ("dave4" ));
110-
111- assertTrue (rs .next () );
112- assertTrue (rs .getInt ("id" ) ==5 );
113- assertTrue (rs .getString ("name" ).equals ("dave5" ));
114-
115- }
86+ rs =st .executeQuery ("select oid,* from updateable" );
87+ if (rs .first () )
88+ {
89+ rs .updateInt ("id" ,3 );
90+ rs .updateString ("name" ,"dave3" );
91+ rs .updateRow ();
92+ assertTrue (rs .getInt ("id" ) ==3 );
93+ assertTrue (rs .getString ("name" ).equals ("dave3" ));
94+
95+ rs .moveToInsertRow ();
96+ rs .updateInt ("id" ,4 );
97+ rs .updateString ("name" ,"dave4" );
98+
99+ rs .insertRow ();
100+ rs .updateInt ("id" ,5 );
101+ rs .updateString ("name" ,"dave5" );
102+ rs .insertRow ();
103+
104+ rs .moveToCurrentRow ();
105+ assertTrue (rs .getInt ("id" ) ==3 );
106+ assertTrue (rs .getString ("name" ).equals ("dave3" ));
107+
108+ assertTrue (rs .next () );
109+ assertTrue (rs .getInt ("id" ) ==4 );
110+ assertTrue (rs .getString ("name" ).equals ("dave4" ));
111+
112+ assertTrue (rs .next () );
113+ assertTrue (rs .getInt ("id" ) ==5 );
114+ assertTrue (rs .getString ("name" ).equals ("dave5" ));
115+
116+ }
116117 }
117118catch (SQLException ex )
118119 {
119120fail (ex .getMessage ());
120121 }
121122
122- st .close ();
123+ st .close ();
123124
124125TestUtil .dropTable (con ,"updateable" );
125- TestUtil .closeDB (con );
126- }
127- catch (Exception ex )
128- {
129- fail (ex .getMessage ());
130- }
131- }
126+ TestUtil .closeDB (con );
127+ }
128+ catch (Exception ex )
129+ {
130+ fail (ex .getMessage ());
131+ }
132+ }
132133
133134
134135}