From: Carlos Guzm?n ?l. <car...@us...> - 2004-02-05 14:40:18
|
Update of /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27189 Modified Files: FbBackup.cs FbConfiguration.cs FbLog.cs FbRestore.cs FbSecurity.cs FbService.cs FbStatistical.cs FbValidation.cs Log Message: 2004-02-05 Carlos Guzmán Álvarez <car...@te...> * Added documentation fileds from the 1.5 sources. * FirebirdSql.Data.Firebird/services/FbService.cs: * FirebirdSql.Data.Firebird/services/FbBackup.cs: * FirebirdSql.Data.Firebird/services/FbConfiguration.cs: * FirebirdSql.Data.Firebird/services/FbLog.cs: * FirebirdSql.Data.Firebird/services/FbRestore.cs: * FirebirdSql.Data.Firebird/services/FbSecurity.cs: * FirebirdSql.Data.Firebird/services/FbStatistical.cs: * FirebirdSql.Data.Firebird/services/FbValidation.cs: - Set attachSpb and querySpb as private. - Rename startSpb as StartSpb and set it as protected internal. * FirebirdSql.Data.Firebird/FbConnection.cs: - Added documentation comments for DropDatabase and new BeginTransaction overloads. Index: FbBackup.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbBackup.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- FbBackup.cs 2 Jan 2004 15:33:06 -0000 1.3 +++ FbBackup.cs 5 Feb 2004 14:37:42 -0000 1.4 @@ -131,26 +131,26 @@ public void Start() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_backup); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_backup); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); foreach(FbBackupFile bkpFile in backupFiles) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_bkp_file, bkpFile.BackupFile); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_bkp_length, bkpFile.BackupLength); } if (verbose) { - this.startSpb.Append(IscCodes.isc_spb_verbose); + this.StartSpb.Append(IscCodes.isc_spb_verbose); } - this.startSpb.Append(IscCodes.isc_spb_options, (int)this.options); + this.StartSpb.Append(IscCodes.isc_spb_options, (int)this.options); // Start execution this.startTask(); Index: FbConfiguration.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbConfiguration.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- FbConfiguration.cs 2 Jan 2004 15:33:06 -0000 1.3 +++ FbConfiguration.cs 5 Feb 2004 14:37:42 -0000 1.4 @@ -55,12 +55,12 @@ public void SetSqlDialect(int sqlDialect) { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_set_sql_dialect, sqlDialect); @@ -74,12 +74,12 @@ public void SetSweepInterval(int sweepInterval) { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_sweep_interval, sweepInterval); @@ -93,12 +93,12 @@ public void SetPageBuffers(int pageBuffers) { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_page_buffers, pageBuffers); @@ -112,28 +112,28 @@ public void DatabaseShutdown(FbShutdownMode mode, int seconds) { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); switch (mode) { case FbShutdownMode.Forced: - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_shutdown_db, seconds); break; case FbShutdownMode.DenyTransaction: - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_deny_new_transactions, seconds); break; case FbShutdownMode.DenyConnection: - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_deny_new_attachments, seconds); break; @@ -149,12 +149,12 @@ public void DatabaseOnline() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_options, IscCodes.isc_spb_prp_db_online); @@ -168,12 +168,12 @@ public void ActivateShadows() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_options, IscCodes.isc_spb_prp_activate); @@ -187,22 +187,22 @@ public void SetForcedWrites(bool forcedWrites) { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); // WriteMode if (forcedWrites) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_write_mode, (byte)IscCodes.isc_spb_prp_wm_sync); } else { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_write_mode, (byte)IscCodes.isc_spb_prp_wm_async); } @@ -216,22 +216,22 @@ /// <include file='Doc/en_EN/FbConfiguration.xml' path='doc/class[@name="FbConfiguration"]/method[@name="SetReserveSpace(System.Boolean)"]/*'/> public void SetReserveSpace(bool reserveSpace) { - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); // Reserve Space if (reserveSpace) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_reserve_space, (byte)IscCodes.isc_spb_prp_res); } else { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_reserve_space, (byte)IscCodes.isc_spb_prp_res_use_full); } @@ -246,22 +246,22 @@ public void SetAccessMode(bool readOnly) { // Configure Spb - this.startSpb = new SpbBuffer(); + this.StartSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_properties); - this.startSpb.Append( + this.StartSpb.Append(IscCodes.isc_action_svc_properties); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); if (readOnly) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_access_mode, (byte)IscCodes.isc_spb_prp_am_readonly); } else { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_prp_access_mode, (byte)IscCodes.isc_spb_prp_am_readwrite); } Index: FbLog.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbLog.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- FbLog.cs 2 Jan 2004 15:33:06 -0000 1.2 +++ FbLog.cs 5 Feb 2004 14:37:42 -0000 1.3 @@ -40,8 +40,8 @@ public void Start() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_get_ib_log); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_get_ib_log); // Start execution this.startTask(); Index: FbRestore.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbRestore.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- FbRestore.cs 2 Jan 2004 15:33:06 -0000 1.3 +++ FbRestore.cs 5 Feb 2004 14:37:42 -0000 1.4 @@ -129,24 +129,24 @@ public void Start() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_restore); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_restore); foreach(FbBackupFile bkpFile in backupFiles) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_bkp_file, bkpFile.BackupFile); } - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); if (this.verbose) { - this.startSpb.Append(IscCodes.isc_spb_verbose); + this.StartSpb.Append(IscCodes.isc_spb_verbose); } - this.startSpb.Append(IscCodes.isc_spb_res_buffers, this.pageBuffers); - this.startSpb.Append(IscCodes.isc_spb_res_page_size, this.pageSize); - this.startSpb.Append(IscCodes.isc_spb_options, (int)this.options); + this.StartSpb.Append(IscCodes.isc_spb_res_buffers, this.pageBuffers); + this.StartSpb.Append(IscCodes.isc_spb_res_page_size, this.pageSize); + this.StartSpb.Append(IscCodes.isc_spb_options, (int)this.options); // Start execution this.startTask(); Index: FbSecurity.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbSecurity.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -b -U3 -r1.2 -r1.3 --- FbSecurity.cs 2 Jan 2004 15:33:06 -0000 1.2 +++ FbSecurity.cs 5 Feb 2004 14:37:42 -0000 1.3 @@ -65,53 +65,53 @@ throw new InvalidOperationException("Invalid user password."); } // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_add_user); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_add_user); - this.startSpb.Append(IscCodes.isc_spb_sec_username, user.UserName); - this.startSpb.Append( + this.StartSpb.Append(IscCodes.isc_spb_sec_username, user.UserName); + this.StartSpb.Append( IscCodes.isc_spb_sec_password, user.UserPassword); if (user.FirstName != null && user.FirstName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_firstname, user.FirstName); } if (user.MiddleName != null && user.MiddleName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_middlename, user.MiddleName); } if (user.LastName != null && user.LastName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_lastname, user.LastName); } if (user.UserID != 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_userid, user.UserID); } if (user.GroupID != 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_groupid, user.GroupID); } if (user.GroupName != null && user.GroupName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_groupname, user.GroupName); } if (user.RoleName != null && user.RoleName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sql_role_name, user.RoleName); } @@ -131,16 +131,16 @@ } // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_delete_user); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_delete_user); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_username, user.UserName); if (user.RoleName != null && user.RoleName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sql_role_name, user.RoleName); } @@ -164,48 +164,48 @@ } // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_modify_user); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_modify_user); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_username, user.UserName); if (user.UserPassword.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_password, user.UserPassword); } if (user.FirstName != null) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_firstname, user.FirstName); } if (user.MiddleName != null) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_middlename, user.MiddleName); } if (user.LastName != null) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_lastname, user.LastName); } - this.startSpb.Append(IscCodes.isc_spb_sec_userid, user.UserID); - this.startSpb.Append(IscCodes.isc_spb_sec_groupid, user.GroupID); + this.StartSpb.Append(IscCodes.isc_spb_sec_userid, user.UserID); + this.StartSpb.Append(IscCodes.isc_spb_sec_groupid, user.GroupID); if (user.GroupName != null && user.GroupName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sec_groupname, user.GroupName); } if (user.RoleName != null && user.RoleName.Length > 0) { - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_sql_role_name, user.RoleName); } @@ -220,9 +220,9 @@ public FbUserData DisplayUser(string userName) { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_display_user); - this.startSpb.Append(IscCodes.isc_spb_sec_username, userName); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_display_user); + this.StartSpb.Append(IscCodes.isc_spb_sec_username, userName); // Start execution this.startTask(); @@ -242,8 +242,8 @@ public FbUserData[] DisplayUsers() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_display_user); + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_display_user); // Start execution this.startTask(); Index: FbService.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbService.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- FbService.cs 2 Jan 2004 15:33:06 -0000 1.3 +++ FbService.cs 5 Feb 2004 14:37:42 -0000 1.4 @@ -233,9 +233,14 @@ private AttachmentParams parameters; private FbServiceState state; private int queryBufferSize; - protected SpbBuffer attachSpb; - protected SpbBuffer startSpb; - protected SpbBuffer querySpb; + private SpbBuffer attachSpb; + private SpbBuffer querySpb; + + #endregion + + #region Protected Fields + + protected internal SpbBuffer StartSpb; #endregion @@ -409,7 +414,7 @@ try { // Start service operation - this.svc.Start(this.startSpb); + this.svc.Start(this.StartSpb); } catch (IscException ex) { Index: FbStatistical.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbStatistical.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- FbStatistical.cs 2 Jan 2004 15:33:06 -0000 1.3 +++ FbStatistical.cs 5 Feb 2004 14:37:42 -0000 1.4 @@ -77,12 +77,12 @@ public void Start() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_db_stats); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_db_stats); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_options, (int)this.options); Index: FbValidation.cs =================================================================== RCS file: /cvsroot/firebird/NETProvider/NETProvider_16/source/FirebirdSql.Data.Firebird/Services/FbValidation.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -b -U3 -r1.3 -r1.4 --- FbValidation.cs 2 Jan 2004 15:33:06 -0000 1.3 +++ FbValidation.cs 5 Feb 2004 14:37:42 -0000 1.4 @@ -81,12 +81,12 @@ public void Start() { // Configure Spb - this.startSpb = new SpbBuffer(); - this.startSpb.Append(IscCodes.isc_action_svc_repair); - this.startSpb.Append( + this.StartSpb = new SpbBuffer(); + this.StartSpb.Append(IscCodes.isc_action_svc_repair); + this.StartSpb.Append( IscCodes.isc_spb_dbname, this.Parameters.Database); - this.startSpb.Append( + this.StartSpb.Append( IscCodes.isc_spb_options, (int)this.options); |