--- trunk/TSAdminTool/atsDataSet.Designer.cs 2012/07/13 00:43:28 74 +++ trunk/TSAdminTool/atsDataSet.Designer.cs 2012/07/13 01:12:48 75 @@ -5296,7 +5296,7 @@ namespace AnywhereTS.atsDataSetTableAdap this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [Client] WHERE (((@IsNull_ClientName = 1 AND [ClientName] IS NULL) OR" + + this._adapter.DeleteCommand.CommandText = string.Format("DELETE FROM {0}..[Client] WHERE (((@IsNull_ClientName = 1 AND [ClientName] IS NULL) OR" + " ([ClientName] = @Original_ClientName)) AND ([MacAddress] = @Original_MacAddress" + ") AND ((@IsNull_Group = 1 AND [Group] IS NULL) OR ([Group] = @Original_Group)) A" + "ND ((@IsNull_ScreenResolution = 1 AND [ScreenResolution] IS NULL) OR ([ScreenRes" + @@ -5349,7 +5349,7 @@ namespace AnywhereTS.atsDataSetTableAdap "inal_IcaServer)) AND ((@IsNull_TempString = 1 AND [TempString] IS NULL) OR ([Tem" + "pString] = @Original_TempString)) AND ((@IsNull_TempBit = 1 AND [TempBit] IS NUL" + "L) OR ([TempBit] = @Original_TempBit)) AND ((@IsNull_TempInt = 1 AND [TempInt] I" + - "S NULL) OR ([TempInt] = @Original_TempInt)))"; + "S NULL) OR ([TempInt] = @Original_TempInt)))", ATSGlobals.strDatabaseName); this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ClientName", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClientName", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ClientName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClientName", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -5437,7 +5437,7 @@ namespace AnywhereTS.atsDataSetTableAdap this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_TempInt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TempInt", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [Client] ([ClientName], [MacAddress], [Group], [ScreenResolution], [S" + + this._adapter.InsertCommand.CommandText =string.Format("INSERT INTO {0}..[Client] ([ClientName], [MacAddress], [Group], [ScreenResolution], [S" + "creenColorDepth], [AutoPlayCD], [ServerName], [SessionType], [ReconnectPrompt], " + "[AudioLevel], [MouseResolution], [Comment], [Username], [Password], [ServerDomai" + "n], [ServerVersion], [RedirectFloppy], [RedirectCD], [RedirectSound], [DigitalMo" + @@ -5460,7 +5460,7 @@ namespace AnywhereTS.atsDataSetTableAdap "ompression, IcaAudioQuality, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, D" + "ailyReboot, KeyboardMap, TimeZone, RedirectCom1, RedirectCom2, UsbDrive, UsbDriv" + "eName, ServerPort, NumLock, Created, Modified, IcaApplicationSet, IcaServer, Tem" + - "pString, TempBit, TempInt FROM Client WHERE (MacAddress = @MacAddress)"; + "pString, TempBit, TempInt FROM Client WHERE (MacAddress = @MacAddress)", ATSGlobals.strDatabaseName); this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ClientName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClientName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MacAddress", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MacAddress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -5507,7 +5507,7 @@ namespace AnywhereTS.atsDataSetTableAdap this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TempInt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "TempInt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [Client] SET [ClientName] = @ClientName, [MacAddress] = @MacAddress, [Grou" + + this._adapter.UpdateCommand.CommandText = string.Format("UPDATE {0}..[Client] SET [ClientName] = @ClientName, [MacAddress] = @MacAddress, [Grou" + "p] = @Group, [ScreenResolution] = @ScreenResolution, [ScreenColorDepth] = @Scree" + "nColorDepth, [AutoPlayCD] = @AutoPlayCD, [ServerName] = @ServerName, [SessionTyp" + "e] = @SessionType, [ReconnectPrompt] = @ReconnectPrompt, [AudioLevel] = @AudioLe" + @@ -5584,7 +5584,7 @@ namespace AnywhereTS.atsDataSetTableAdap "lity, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, DailyReboot, KeyboardMap" + ", TimeZone, RedirectCom1, RedirectCom2, UsbDrive, UsbDriveName, ServerPort, NumL" + "ock, Created, Modified, IcaApplicationSet, IcaServer, TempString, TempBit, TempI" + - "nt FROM Client WHERE (MacAddress = @MacAddress)"; + "nt FROM Client WHERE (MacAddress = @MacAddress)", ATSGlobals.strDatabaseName); this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ClientName", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClientName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MacAddress", global::System.Data.SqlDbType.NChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "MacAddress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -5726,28 +5726,28 @@ namespace AnywhereTS.atsDataSetTableAdap this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT *\r\nFROM Client"; + this._commandCollection[0].CommandText = string.Format("SELECT *\r\nFROM {0}..Client", ATSGlobals.strDatabaseName); this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT COUNT(*) FROM Client\r\nWHERE MacAddress = \'Default \'"; + this._commandCollection[1].CommandText = string.Format("SELECT COUNT(*) FROM {0}..Client\r\nWHERE MacAddress = \'Default \'", ATSGlobals.strDatabaseName); this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT AudioLevel, AutoPlayCD, ClientName, Comment, Created, DailyReboot, DigitalMonitor, [Group], IcaApplicationSet, IcaAudioQuality, IcaCompression, IcaEncryption, IcaProtocol, IcaServer, KeyboardMap, MacAddress, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, Modified, MouseResolution, NumLock, Password, ReconnectPrompt, RedirectCD, RedirectCom1, RedirectCom2, RedirectFloppy, RedirectSound, ScreenColorDepth, ScreenResolution, ServerDomain, ServerName, ServerPort, ServerVersion, SessionType, TempBit, TempInt, TempString, TimeZone, UsbDrive, UsbDriveName, Username FROM Client WHERE (MacAddress = 'Default ')"; + this._commandCollection[2].CommandText = string.Format(@"SELECT AudioLevel, AutoPlayCD, ClientName, Comment, Created, DailyReboot, DigitalMonitor, [Group], IcaApplicationSet, IcaAudioQuality, IcaCompression, IcaEncryption, IcaProtocol, IcaServer, KeyboardMap, MacAddress, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, Modified, MouseResolution, NumLock, Password, ReconnectPrompt, RedirectCD, RedirectCom1, RedirectCom2, RedirectFloppy, RedirectSound, ScreenColorDepth, ScreenResolution, ServerDomain, ServerName, ServerPort, ServerVersion, SessionType, TempBit, TempInt, TempString, TimeZone, UsbDrive, UsbDriveName, Username FROM {0}..Client WHERE (MacAddress = 'Default ')", ATSGlobals.strDatabaseName); this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT AudioLevel, AutoPlayCD, ClientName, Comment, Created, DailyReboot, DigitalMonitor, [Group], IcaApplicationSet, IcaAudioQuality, IcaCompression, IcaEncryption, IcaProtocol, IcaServer, KeyboardMap, MacAddress, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, Modified, MouseResolution, NumLock, Password, ReconnectPrompt, RedirectCD, RedirectCom1, RedirectCom2, RedirectFloppy, RedirectSound, ScreenColorDepth, ScreenResolution, ServerDomain, ServerName, ServerPort, ServerVersion, SessionType, TempBit, TempInt, TempString, TimeZone, UsbDrive, UsbDriveName, Username FROM Client WHERE (MacAddress <> 'Default') ORDER BY ClientName"; + this._commandCollection[3].CommandText = string.Format(@"SELECT AudioLevel, AutoPlayCD, ClientName, Comment, Created, DailyReboot, DigitalMonitor, [Group], IcaApplicationSet, IcaAudioQuality, IcaCompression, IcaEncryption, IcaProtocol, IcaServer, KeyboardMap, MacAddress, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, Modified, MouseResolution, NumLock, Password, ReconnectPrompt, RedirectCD, RedirectCom1, RedirectCom2, RedirectFloppy, RedirectSound, ScreenColorDepth, ScreenResolution, ServerDomain, ServerName, ServerPort, ServerVersion, SessionType, TempBit, TempInt, TempString, TimeZone, UsbDrive, UsbDriveName, Username FROM {0}..Client WHERE (MacAddress <> 'Default') ORDER BY ClientName", ATSGlobals.strDatabaseName); this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT AudioLevel, AutoPlayCD, ClientName, Comment, Created, DailyReboot, DigitalMonitor, [Group], IcaApplicationSet, IcaAudioQuality, IcaCompression, IcaEncryption, IcaProtocol, IcaServer, KeyboardMap, MacAddress, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, Modified, MouseResolution, NumLock, Password, ReconnectPrompt, RedirectCD, RedirectCom1, RedirectCom2, RedirectFloppy, RedirectSound, ScreenColorDepth, ScreenResolution, ServerDomain, ServerName, ServerPort, ServerVersion, SessionType, TempBit, TempInt, TempString, TimeZone, UsbDrive, UsbDriveName, Username FROM Client WHERE (ClientName = @name) AND (MacAddress <> 'Default')"; + this._commandCollection[4].CommandText = string.Format(@"SELECT AudioLevel, AutoPlayCD, ClientName, Comment, Created, DailyReboot, DigitalMonitor, [Group], IcaApplicationSet, IcaAudioQuality, IcaCompression, IcaEncryption, IcaProtocol, IcaServer, KeyboardMap, MacAddress, MiscFlippedFix, MiscMousefix, MiscNoAcceleration, Modified, MouseResolution, NumLock, Password, ReconnectPrompt, RedirectCD, RedirectCom1, RedirectCom2, RedirectFloppy, RedirectSound, ScreenColorDepth, ScreenResolution, ServerDomain, ServerName, ServerPort, ServerVersion, SessionType, TempBit, TempInt, TempString, TimeZone, UsbDrive, UsbDriveName, Username FROM {0}..Client WHERE (ClientName = @name) AND (MacAddress <> 'Default')", ATSGlobals.strDatabaseName); this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "ClientName", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "SELECT ClientName, MacAddress, [Group], ScreenResolution, ScreenColorDepth, A" + + this._commandCollection[5].CommandText = string.Format("SELECT ClientName, MacAddress, [Group], ScreenResolution, ScreenColorDepth, A" + "utoPlayCD, ServerName, SessionType, ReconnectPrompt, AudioLevel, \r\n " + " MouseResolution, Comment, Username, Password, ServerDomain, ServerVersi" + "on, RedirectFloppy, RedirectCD, RedirectSound, DigitalMonitor, \r\n " + @@ -5765,9 +5765,9 @@ namespace AnywhereTS.atsDataSetTableAdap " MiscNoAcceleration, DailyReboot, KeyboardMap, TimeZone, Redir" + "ectCom1, RedirectCom2, UsbDrive, UsbDriveName, ServerPort, \r\n " + " NumLock, Created, Modified, IcaApplicationSet, IcaSer" + - "ver, TempString, TempBit, TempInt\r\n FROM Client\r\n" + + "ver, TempString, TempBit, TempInt\r\n FROM {0}..Client\r\n" + " WHERE (MacAddress <> \'Default\')\r\n " + - " ORDER BY Created) AS cl\r\nORDER BY ClientName"; + " ORDER BY Created) AS cl\r\nORDER BY ClientName", ATSGlobals.strDatabaseName); this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@topcount", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -5996,9 +5996,9 @@ namespace AnywhereTS.atsDataSetTableAdap this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[Group] WHERE (([ID] = @Original_ID) AND ((@IsNull_Parent = 1 A" + + this._adapter.DeleteCommand.CommandText = string.Format("DELETE FROM {0}..[Group] WHERE (([ID] = @Original_ID) AND ((@IsNull_Parent = 1 A" + "ND [Parent] IS NULL) OR ([Parent] = @Original_Parent)) AND ((@IsNull_Name = 1 AN" + - "D [Name] IS NULL) OR ([Name] = @Original_Name)))"; + "D [Name] IS NULL) OR ([Name] = @Original_Name)))", ATSGlobals.strDatabaseName); this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ID", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ID", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Parent", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Parent", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -6007,15 +6007,15 @@ namespace AnywhereTS.atsDataSetTableAdap this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[Group] ([Parent], [Name]) VALUES (@Parent, @Name);\r\nSELECT ID," + - " Parent, Name FROM [Group] WHERE (ID = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = string.Format("INSERT INTO {0}..[Group] ([Parent], [Name]) VALUES (@Parent, @Name);\r\nSELECT ID," + + " Parent, Name FROM [Group] WHERE (ID = SCOPE_IDENTITY())", ATSGlobals.strDatabaseName); this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Parent", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Parent", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[Group] SET [Parent] = @Parent, [Name] = @Name WHERE (([ID] = @Original_ID) AND ((@IsNull_Parent = 1 AND [Parent] IS NULL) OR ([Parent] = @Original_Parent)) AND ((@IsNull_Name = 1 AND [Name] IS NULL) OR ([Name] = @Original_Name))); -SELECT ID, Parent, Name FROM [Group] WHERE (ID = @ID)"; + this._adapter.UpdateCommand.CommandText = string.Format(@"UPDATE {0}..[Group] SET [Parent] = @Parent, [Name] = @Name WHERE (([ID] = @Original_ID) AND ((@IsNull_Parent = 1 AND [Parent] IS NULL) OR ([Parent] = @Original_Parent)) AND ((@IsNull_Name = 1 AND [Name] IS NULL) OR ([Name] = @Original_Name))); +SELECT ID, Parent, Name FROM [Group] WHERE (ID = @ID)", ATSGlobals.strDatabaseName); this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Parent", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Parent", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6038,7 +6038,7 @@ SELECT ID, Parent, Name FROM [Group] WHE this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT ID, Parent, Name FROM dbo.[Group]"; + this._commandCollection[0].CommandText = string.Format("SELECT ID, Parent, Name FROM {0}..[Group]", ATSGlobals.strDatabaseName); this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -6329,7 +6329,7 @@ SELECT ID, Parent, Name FROM [Group] WHE this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[Image] WHERE (((@IsNull_UseDHCP = 1 AND [UseDHCP] IS NULL) OR " + + this._adapter.DeleteCommand.CommandText = string.Format("DELETE FROM {0}..[Image] WHERE (((@IsNull_UseDHCP = 1 AND [UseDHCP] IS NULL) OR " + "([UseDHCP] = @Original_UseDHCP)) AND ((@IsNull_ClientIPAddress = 1 AND [ClientIP" + "Address] IS NULL) OR ([ClientIPAddress] = @Original_ClientIPAddress)) AND ((@IsN" + "ull_ClientIPNetmask = 1 AND [ClientIPNetmask] IS NULL) OR ([ClientIPNetmask] = @" + @@ -6356,7 +6356,7 @@ SELECT ID, Parent, Name FROM [Group] WHE "reWidth] = @Original_BootPictureWidth)) AND ((@IsNull_BootPictureHeight = 1 AND " + "[BootPictureHeight] IS NULL) OR ([BootPictureHeight] = @Original_BootPictureHeig" + "ht)) AND ((@IsNull_BootPictureProgressBar = 1 AND [BootPictureProgressBar] IS NU" + - "LL) OR ([BootPictureProgressBar] = @Original_BootPictureProgressBar)))"; + "LL) OR ([BootPictureProgressBar] = @Original_BootPictureProgressBar)))", ATSGlobals.strDatabaseName); this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_UseDHCP", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UseDHCP", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_UseDHCP", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UseDHCP", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -6401,8 +6401,8 @@ SELECT ID, Parent, Name FROM [Group] WHE this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BootPictureProgressBar", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BootPictureProgressBar", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [dbo].[Image] ([UseDHCP], [ClientIPAddress], [ClientIPNetmask], [ClientIPGateway], [ClientIPDNS1], [ClientIPDNS2], [ClientIPDNSSuffix], [ClientBootServer], [ConfigFile], [OnlyUseRDP], [BootPicture], [NetworkDriver], [SoundType], [SoundDriver], [Name], [GraphicsDriver], [Debug], [BootPackage], [BootPictureWidth], [BootPictureHeight], [BootPictureProgressBar], [BootPicturePng]) VALUES (@UseDHCP, @ClientIPAddress, @ClientIPNetmask, @ClientIPGateway, @ClientIPDNS1, @ClientIPDNS2, @ClientIPDNSSuffix, @ClientBootServer, @ConfigFile, @OnlyUseRDP, @BootPicture, @NetworkDriver, @SoundType, @SoundDriver, @Name, @GraphicsDriver, @Debug, @BootPackage, @BootPictureWidth, @BootPictureHeight, @BootPictureProgressBar, @BootPicturePng); -SELECT UseDHCP, ClientIPAddress, ClientIPNetmask, ClientIPGateway, ClientIPDNS1, ClientIPDNS2, ClientIPDNSSuffix, ClientBootServer, ConfigFile, OnlyUseRDP, BootPicture, NetworkDriver, SoundType, SoundDriver, Name, GraphicsDriver, Debug, BootPackage, BootPictureWidth, BootPictureHeight, BootPictureProgressBar, BootPicturePng FROM Image WHERE (Name = @Name)"; + this._adapter.InsertCommand.CommandText = string.Format(@"INSERT INTO {0}..[Image] ([UseDHCP], [ClientIPAddress], [ClientIPNetmask], [ClientIPGateway], [ClientIPDNS1], [ClientIPDNS2], [ClientIPDNSSuffix], [ClientBootServer], [ConfigFile], [OnlyUseRDP], [BootPicture], [NetworkDriver], [SoundType], [SoundDriver], [Name], [GraphicsDriver], [Debug], [BootPackage], [BootPictureWidth], [BootPictureHeight], [BootPictureProgressBar], [BootPicturePng]) VALUES (@UseDHCP, @ClientIPAddress, @ClientIPNetmask, @ClientIPGateway, @ClientIPDNS1, @ClientIPDNS2, @ClientIPDNSSuffix, @ClientBootServer, @ConfigFile, @OnlyUseRDP, @BootPicture, @NetworkDriver, @SoundType, @SoundDriver, @Name, @GraphicsDriver, @Debug, @BootPackage, @BootPictureWidth, @BootPictureHeight, @BootPictureProgressBar, @BootPicturePng); +SELECT UseDHCP, ClientIPAddress, ClientIPNetmask, ClientIPGateway, ClientIPDNS1, ClientIPDNS2, ClientIPDNSSuffix, ClientBootServer, ConfigFile, OnlyUseRDP, BootPicture, NetworkDriver, SoundType, SoundDriver, Name, GraphicsDriver, Debug, BootPackage, BootPictureWidth, BootPictureHeight, BootPictureProgressBar, BootPicturePng FROM Image WHERE (Name = @Name)", ATSGlobals.strDatabaseName); this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UseDHCP", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UseDHCP", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ClientIPAddress", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClientIPAddress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6428,7 +6428,7 @@ SELECT UseDHCP, ClientIPAddress, ClientI this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BootPicturePng", global::System.Data.SqlDbType.Image, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BootPicturePng", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[Image] SET [UseDHCP] = @UseDHCP, [ClientIPAddress] = @ClientIPAddre" + + this._adapter.UpdateCommand.CommandText = string.Format("UPDATE {0}..[Image] SET [UseDHCP] = @UseDHCP, [ClientIPAddress] = @ClientIPAddre" + "ss, [ClientIPNetmask] = @ClientIPNetmask, [ClientIPGateway] = @ClientIPGateway, " + "[ClientIPDNS1] = @ClientIPDNS1, [ClientIPDNS2] = @ClientIPDNS2, [ClientIPDNSSuff" + "ix] = @ClientIPDNSSuffix, [ClientBootServer] = @ClientBootServer, [ConfigFile] =" + @@ -6469,7 +6469,7 @@ SELECT UseDHCP, ClientIPAddress, ClientI "ClientIPDNS2, ClientIPDNSSuffix, ClientBootServer, ConfigFile, OnlyUseRDP, BootP" + "icture, NetworkDriver, SoundType, SoundDriver, Name, GraphicsDriver, Debug, Boot" + "Package, BootPictureWidth, BootPictureHeight, BootPictureProgressBar, BootPictur" + - "ePng FROM Image WHERE (Name = @Name)"; + "ePng FROM Image WHERE (Name = @Name)", ATSGlobals.strDatabaseName); this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UseDHCP", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "UseDHCP", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ClientIPAddress", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ClientIPAddress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -6547,7 +6547,7 @@ SELECT UseDHCP, ClientIPAddress, ClientI this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT * FROM dbo.Image"; + this._commandCollection[0].CommandText = string.Format("SELECT * FROM {0}..Image", ATSGlobals.strDatabaseName); this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -7482,19 +7482,19 @@ SELECT UseDHCP, ClientIPAddress, ClientI this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[TerminalServer] WHERE (([Path] = @Original_Path))"; + this._adapter.DeleteCommand.CommandText = string.Format("DELETE FROM {0}..[TerminalServer] WHERE (([Path] = @Original_Path))", ATSGlobals.strDatabaseName); this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[TerminalServer] ([Path]) VALUES (@Path);\r\nSELECT Path FROM Ter" + - "minalServer WHERE (Path = @Path)"; + this._adapter.InsertCommand.CommandText = string.Format("INSERT INTO {0}.[TerminalServer] ([Path]) VALUES (@Path);\r\nSELECT Path FROM Ter" + + "minalServer WHERE (Path = @Path)", ATSGlobals.strDatabaseName); this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[TerminalServer] SET [Path] = @Path WHERE (([Path] = @Original_Path)" + - ");\r\nSELECT Path FROM TerminalServer WHERE (Path = @Path)"; + this._adapter.UpdateCommand.CommandText = string.Format("UPDATE {0}..[TerminalServer] SET [Path] = @Path WHERE (([Path] = @Original_Path)" + + ");\r\nSELECT Path FROM TerminalServer WHERE (Path = @Path)", ATSGlobals.strDatabaseName); this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -7511,7 +7511,7 @@ SELECT UseDHCP, ClientIPAddress, ClientI this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Path FROM dbo.TerminalServer"; + this._commandCollection[0].CommandText = string.Format("SELECT Path FROM {0}..TerminalServer", ATSGlobals.strDatabaseName); this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -7747,23 +7747,23 @@ SELECT UseDHCP, ClientIPAddress, ClientI this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[TftpServer] WHERE (([Path] = @Original_Path) AND ((@IsNull_Loc" + - "alPath = 1 AND [LocalPath] IS NULL) OR ([LocalPath] = @Original_LocalPath)))"; + this._adapter.DeleteCommand.CommandText = string.Format("DELETE FROM {0}..[TftpServer] WHERE (([Path] = @Original_Path) AND ((@IsNull_Loc" + + "alPath = 1 AND [LocalPath] IS NULL) OR ([LocalPath] = @Original_LocalPath)))", ATSGlobals.strDatabaseName); this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_LocalPath", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LocalPath", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_LocalPath", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LocalPath", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[TftpServer] ([Path], [LocalPath]) VALUES (@Path, @LocalPath);\r" + - "\nSELECT Path, LocalPath FROM TftpServer WHERE (Path = @Path)"; + this._adapter.InsertCommand.CommandText = string.Format("INSERT INTO {0}..[TftpServer] ([Path], [LocalPath]) VALUES (@Path, @LocalPath);\r" + + "\nSELECT Path, LocalPath FROM TftpServer WHERE (Path = @Path)", ATSGlobals.strDatabaseName); this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LocalPath", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LocalPath", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [dbo].[TftpServer] SET [Path] = @Path, [LocalPath] = @LocalPath WHERE (([Path] = @Original_Path) AND ((@IsNull_LocalPath = 1 AND [LocalPath] IS NULL) OR ([LocalPath] = @Original_LocalPath))); -SELECT Path, LocalPath FROM TftpServer WHERE (Path = @Path)"; + this._adapter.UpdateCommand.CommandText = string.Format(@"UPDATE {0}..[TftpServer] SET [Path] = @Path, [LocalPath] = @LocalPath WHERE (([Path] = @Original_Path) AND ((@IsNull_LocalPath = 1 AND [LocalPath] IS NULL) OR ([LocalPath] = @Original_LocalPath))); +SELECT Path, LocalPath FROM TftpServer WHERE (Path = @Path)", ATSGlobals.strDatabaseName); this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Path", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@LocalPath", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "LocalPath", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7783,7 +7783,7 @@ SELECT Path, LocalPath FROM TftpServer W this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Path, LocalPath FROM dbo.TftpServer"; + this._commandCollection[0].CommandText = string.Format("SELECT Path, LocalPath FROM {0}..TftpServer", ATSGlobals.strDatabaseName); this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -8047,25 +8047,25 @@ SELECT Path, LocalPath FROM TftpServer W this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = "DELETE FROM [dbo].[AppInfo] WHERE (([Property] = @Original_Property) AND ((@IsNul" + - "l_Value = 1 AND [Value] IS NULL) OR ([Value] = @Original_Value)))"; + this._adapter.DeleteCommand.CommandText = string.Format("DELETE FROM {0}..[AppInfo] WHERE (([Property] = @Original_Property) AND ((@IsNul" + + "l_Value = 1 AND [Value] IS NULL) OR ([Value] = @Original_Value)))", ATSGlobals.strDatabaseName); this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Property", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Property", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_Value", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Value", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_Value", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Value", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = "INSERT INTO [dbo].[AppInfo] ([Property], [Value]) VALUES (@Property, @Value);\r\nSE" + - "LECT Property, Value FROM AppInfo WHERE (Property = @Property)"; + this._adapter.InsertCommand.CommandText = string.Format("INSERT INTO {0}..[AppInfo] ([Property], [Value]) VALUES (@Property, @Value);\r\nSE" + + "LECT Property, Value FROM AppInfo WHERE (Property = @Property)", ATSGlobals.strDatabaseName); this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Property", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Property", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Value", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [dbo].[AppInfo] SET [Property] = @Property, [Value] = @Value WHERE (([Prop" + + this._adapter.UpdateCommand.CommandText = string.Format("UPDATE {0}..[AppInfo] SET [Property] = @Property, [Value] = @Value WHERE (([Prop" + "erty] = @Original_Property) AND ((@IsNull_Value = 1 AND [Value] IS NULL) OR ([Va" + "lue] = @Original_Value)));\r\nSELECT Property, Value FROM AppInfo WHERE (Property " + - "= @Property)"; + "= @Property)", ATSGlobals.strDatabaseName); this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Property", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Property", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Value", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -8085,7 +8085,7 @@ SELECT Path, LocalPath FROM TftpServer W this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Property, Value FROM dbo.AppInfo"; + this._commandCollection[0].CommandText = string.Format("SELECT Property, Value FROM {0}..AppInfo", ATSGlobals.strDatabaseName); this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } |