Subversion Repository Public Repository

ConnectionOdbcSdk

Diff Revisions 9 vs 10 for /trunk/ConnectionServer/ConnectionServerOdbc.cs

Diff revisions: vs.
  @@ -1,7 +1,5 @@
1 1 using System.Collections.Generic;
2 - using System.Diagnostics;
3 2 using System;
4 - using System.Windows.Forms;
5 3 using System.Data;
6 4 using System.Net;
7 5
  @@ -306,7 +304,7 @@
306 304 DataTable oTableLocations;
307 305
308 306 //there should only ever be one row returned from this query - if not we have a problem
309 - DbFetchResult ret = DatabaseFunctions.FillDataTableBlocking("SELECT * FROM vw_LocalVMS", out oTableLocations);
307 + DbFetchResult ret = DatabaseFunctions.FillDataTableBlocking("SELECT * FROM vw_LocalVMS", out oTableLocations,true,null);
310 308 if (ret.Successful == false)
311 309 {
312 310 RaiseErrorEvent("(error) fetching location properties in FillLocationProperties on ConnectionServerOdbc.cs:" + ret.ErrorDetails);
  @@ -516,12 +514,6 @@
516 514 _unityVersion.IsCoResident = false;
517 515 _unityVersion.IsConnection = true;
518 516
519 - if (DatabaseFunctions.DatabaseConnectionStatus != ConnectionState.Open )
520 - {
521 - RaiseErrorEvent("(error) Login to remote Connection server is not currently open in InitVersionInfo - no version information can be retrieved.");
522 - return;
523 - }
524 -
525 517 //first check if this is a co-res install
526 518 string strTemp = DatabaseFunctions.GetConfigurationString("System.SystemSetup.PlatformConfiguration.deployment");
527 519 if (strTemp.Length > 0)
  @@ -533,7 +525,7 @@
533 525 }
534 526
535 527 //now fetch the version string from the schema information
536 - DbFetchResult ret = DatabaseFunctions.FillDataTableBlocking("SELECT * FROM vw_Schemainformation WHERE IsCurrent=1", out dtTemp);
528 + DbFetchResult ret = DatabaseFunctions.FillDataTableBlocking("SELECT * FROM vw_Schemainformation WHERE IsCurrent=1", out dtTemp,false,null);
537 529 if (ret.Successful == false)
538 530 {
539 531 RaiseErrorEvent("Unable to pull SchemaInformation data in InitVersionInfo - cannot fetch version.");