AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jj: remove references to LOGGED_IN, LOGGED_WHERE from dataset and code

Browse Source
This commit is contained in:
Jonathan Jenne 2018-11-06 12:01:39 +01:00
parent eb05e0ca9d
commit 4ad91296cd
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Global_Indexer/MyDataset.Designer.vb generated
View File

@ -19610,9 +19610,8 @@ Namespace MyDatasetTableAdapters
Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PRENAME, NAME, USERNAME, EMAIL, "& _
"ADDED_WHO, LANGUAGE, SHORTNAME)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PRENAME,@NAME,@USERNAME,@EMAIL,"& _
"@ADDED_WHO,@LANGUAGE,@SHORTNAME); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PRENAME, NAME, USERNAME, EMA"& _
"IL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, GI_ADMIN, ADDED_WHO, ADD"& _
"ED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY()"& _
")"
"IL, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WH"& _
"ERE (GUID = SCOPE_IDENTITY())"
Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@ -19626,9 +19625,8 @@ Namespace MyDatasetTableAdapters
Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_USER"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PRENAME = @PRENAME, NAME = @NAME, USER"& _
"NAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, LANGUAGE = @LANGUA"& _
"GE, SHORTNAME = @SHORTNAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GU"& _
"ID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OU"& _
"T_WHEN, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USE"& _
"R WHERE (GUID = @GUID)"
"ID, PRENAME, NAME, USERNAME, EMAIL, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _
", CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID)"
Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PRENAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "PRENAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))

4
Global_Indexer/MyDataset.xsd
View File

@ -40,7 +40,7 @@
<CommandText>INSERT INTO TBDD_USER
(PRENAME, NAME, USERNAME, EMAIL, ADDED_WHO, LANGUAGE, SHORTNAME)
VALUES (@PRENAME,@NAME,@USERNAME,@EMAIL,@ADDED_WHO,@LANGUAGE,@SHORTNAME);
SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())</CommandText>
SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = SCOPE_IDENTITY())</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
@ -64,7 +64,7 @@ FROM TBDD_USER</CommandText>
<CommandText>UPDATE TBDD_USER
SET PRENAME = @PRENAME, NAME = @NAME, USERNAME = @USERNAME, EMAIL = @EMAIL, CHANGED_WHO = @CHANGED_WHO, LANGUAGE = @LANGUAGE, SHORTNAME = @SHORTNAME
WHERE (GUID = @Original_GUID);
SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, LOGGED_IN, LOGGED_WHERE, LOG_IN_WHEN, LOG_OUT_WHEN, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID)</CommandText>
SELECT GUID, PRENAME, NAME, USERNAME, EMAIL, GI_ADMIN, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_USER WHERE (GUID = @GUID)</CommandText>
<Parameters>
<Parameter AllowDbNull="true" AutogeneratedName="PRENAME" ColumnName="PRENAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@PRENAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="PRENAME" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />

10
Global_Indexer/frmStart.vb
View File

@ -299,14 +299,8 @@ Public Class frmStart
ClassLogger.Add("", False)
If START_INCOMPLETE = False Then
Dim sql = "UPDATE TBDD_USER SET LOGGED_IN = 0, LOGGED_WHERE = '' WHERE LOWER(USERNAME) = LOWER('" & Environment.UserName & "')"
If ClassDatabase.Execute_non_Query(sql, True) = True Then
sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
If ClassDatabase.Execute_non_Query(sql, True) = True Then
End If
End If
Dim Sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
ClassDatabase.Execute_non_Query(Sql, True)
End If
ClassWindowLocation.SaveFormLocationSize(Me)
Catch ex As Exception