[H2-commits] r1135 - humano2/trunk/core/db/pgsql

[<sv...@de...>]

Author: marcelo
Date: 2005-05-24 12:45:57 -0400 (Tue, 24 May 2005)
New Revision: 1135

Modified:
   humano2/trunk/core/db/pgsql/pgsqlConnection.cs
Log:
 * Added try-catch to all commands that exeute SQL statements (doSelect, =
doScalar, doCommand)

Modified: humano2/trunk/core/db/pgsql/pgsqlConnection.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/core/db/pgsql/pgsqlConnection.cs	2005-05-24 15:56:21 UT=
C (rev 1134)
+++ humano2/trunk/core/db/pgsql/pgsqlConnection.cs	2005-05-24 16:45:57 UT=
C (rev 1135)
@@ -70,7 +70,17 @@
 			NpgsqlConnection conn =3D ( (NpgsqlConnection) dbCon );
 		=09
 			NpgsqlDataAdapter da =3D new NpgsqlDataAdapter(query,conn);
-			da.Fill(ds);
+			try
+			{
+				da.Fill(ds);
+			}
+			catch(Exception ex)
+			{
+				Close();
+				Logger.Log("Error executing query:\r\n" + query, LogLevel.Trace);
+				throw new Exception("Error executing query:\r\n" + query + "\n\r" +e=
x.Message,ex.InnerException);
+			}
+			da.Dispose();
 			Close();
 			return ds;
=20
@@ -87,7 +97,19 @@
 			NpgsqlConnection conn =3D ( (NpgsqlConnection) dbCon );
 			NpgsqlCommand dbCmd =3D conn.CreateCommand( );
 			dbCmd.CommandText =3D query;
-			int res =3D dbCmd.ExecuteNonQuery( );
+			int res;
+			try=20
+			{
+				res =3D dbCmd.ExecuteNonQuery( );
+			}
+			catch(Exception ex)
+			{
+				dbCmd.Dispose();
+				Close();
+				Logger.Log("Error executing query:\r\n" + query, LogLevel.Trace);
+				throw new Exception("Error executing query:\r\n" + query + "\n\r" +e=
x.Message,ex.InnerException);
+			}
+			dbCmd.Dispose();
 			Close();
 			return res;
 		}
@@ -103,13 +125,30 @@
 			NpgsqlConnection conn =3D ( (NpgsqlConnection) dbCon );
 			NpgsqlCommand dbCmd =3D conn.CreateCommand( );
 			dbCmd.CommandText =3D query;
-			IDataReader dr =3D dbCmd.ExecuteReader( );
-			Close();
 		=09
+			IDataReader dr;
+			try
+			{
+				dr =3D dbCmd.ExecuteReader( );
+				Close();
+			}
+			catch(Exception ex)
+			{
+				dbCmd.Dispose();
+				Close();
+				Logger.Log("Error executing query:\r\n" + query, LogLevel.Trace);
+				throw new Exception("Error executing query:\r\n" + query + "\n\r" +e=
x.Message,ex.InnerException);
+			}
+
 			if( dr.Read( ) && !Convert.IsDBNull( dr[0] ) )
 			{
+				tmpObj =3D dr[0];
+				dr.Close();
+				dbCmd.Dispose();
 				return dr[0];
 			}
+			dr.Close();
+			dbCmd.Dispose();
 			return null;
 		}
=20