From: Carlos Guzm?n ?l. <car...@us...> - 2003-05-30 15:48:42
|
Update of /cvsroot/firebird/Net-Provider/source In directory sc8-pr-cvs1:/tmp/cvs-serv6107 Modified Files: Tag: branch-release-1-1 FbConnection.cs FbResultSet.cs FbScript.cs FbStatement.cs Log Message: * Some cleanup and code rework in GDS implementation. * source/INGDS/GDSCodes.cs: - Added new blr_xxxx constans. Index: FbConnection.cs =================================================================== RCS file: /cvsroot/firebird/Net-Provider/source/FbConnection.cs,v retrieving revision 1.71.2.11 retrieving revision 1.71.2.12 diff -b -U3 -r1.71.2.11 -r1.71.2.12 --- FbConnection.cs 13 May 2003 14:44:21 -0000 1.71.2.11 +++ FbConnection.cs 30 May 2003 15:48:34 -0000 1.71.2.12 @@ -349,7 +349,7 @@ /// <include file='xmldoc/fbconnection.xml' path='doc/member[@name="M:CreateDabase(System.String, System.Int32, System.String, System.String, System.String, System.Byte, System.Int16, System.String)"]/*'/> public static void CreateDatabase(string dataSource, int port, string database, string user, string password, byte dialect, bool forceWrite, short pageSize, string charset) { - IGDS gds = GDSFactory.NewGDS(); + IGDS gds = new GDS(); isc_db_handle_impl db = null; FbParameterBlock dpb = new FbParameterBlock(); Index: FbResultSet.cs =================================================================== RCS file: /cvsroot/firebird/Net-Provider/source/FbResultSet.cs,v retrieving revision 1.27.2.4 retrieving revision 1.27.2.5 diff -b -U3 -r1.27.2.4 -r1.27.2.5 --- FbResultSet.cs 29 May 2003 18:47:50 -0000 1.27.2.4 +++ FbResultSet.cs 30 May 2003 15:48:34 -0000 1.27.2.5 @@ -608,7 +608,7 @@ for (int i = 0; i < FieldCount; i++) { - row[i] = statement.out_sqlda.sqlvar[i].sqldata; + row[i] = statement.OutSqlda.sqlvar[i].sqldata; } } Index: FbScript.cs =================================================================== RCS file: /cvsroot/firebird/Net-Provider/source/Attic/FbScript.cs,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -b -U3 -r1.1.2.7 -r1.1.2.8 --- FbScript.cs 26 May 2003 15:24:13 -0000 1.1.2.7 +++ FbScript.cs 30 May 2003 15:48:34 -0000 1.1.2.8 @@ -31,6 +31,8 @@ /// <include file='xmldoc/fbscript.xml' path='doc/member[@name="T:FbScript"]/*'/> public class FbScript { + #region STRUCTS + private struct isqlCommand { public string Name; @@ -44,6 +46,8 @@ DDL = ddl; } } + + #endregion #region FIELDS Index: FbStatement.cs =================================================================== RCS file: /cvsroot/firebird/Net-Provider/source/FbStatement.cs,v retrieving revision 1.44.2.7 retrieving revision 1.44.2.8 diff -b -U3 -r1.44.2.7 -r1.44.2.8 --- FbStatement.cs 29 May 2003 18:47:51 -0000 1.44.2.7 +++ FbStatement.cs 30 May 2003 15:48:34 -0000 1.44.2.8 @@ -239,7 +239,7 @@ /* Close the statement if its executed * and it have columns */ - if (statement.out_sqlda.sqld != 0 && + if (statement.OutSqlda.sqld != 0 && state == CommandState.Executed) { connection.IscConnection.GDS.isc_dsql_free_statement(statement, GdsCodes.DSQL_close); |