Merge pull request #12 from UTengine/CharacterLogoutSaveFix

Fixing character logout save

Author: stevewgr

import.ps1

@@ -106,15 +106,15 @@ function RunMigrationScripts {
 function RunMigrationScriptsAndGenerateDiffs {
   $scripts = GetMigrationScripts
   MessageInfo "`n`n### Running $($scripts.Count) migration scripts and generate diffs... ###"
-  $targetDirs = ".\src\schema\*", ".\src\data\*", ".\src\procedure\*"
+  $targetDirs = ".\src\schema\", ".\src\data\", ".\src\procedure\"
   $tempUniqueCommitMessage = "####" + (New-Guid)
 
   git reset # unstage all changes
   git clean -f .\src\migration\*.diff # cleanup previous untracked diff files
   foreach ($script In $scripts) {
     Message $script.FullName
     InvokeSqlScript -script_path $script.FullName
-    .\export.ps1 -server_name $server_name -db_name $db_name -quiet $true
+    .\export.ps1 -server_name $server_name -db_name $db_name -apply_format $false -quiet $true
     git add $targetDirs
     $diffOutputFile = $script.FullName + ".diff"
     # Note that powershell messes up with the output and corrupts the patch, hence we use cmd here.

src/migration/10_fix_userdata_columns.sql

@@ -0,0 +1,29 @@
+-- Note that normally we would need to recreate the table if we want to perserve the order of columns,
+-- as there is no way of sorting them. Worth noting that the sql engine doesn't care much about the order when
+-- explictly querying columns from tables. However since the columns we modify are the last ones, we can
+-- take a shortcut by droping and then adding them in the right order.
+
+-- No longer need default value constraints for it, since it is fixed length binary column.
+ALTER TABLE USERDATA DROP CONSTRAINT DF_USERDATA_strSkill;
+GO
+
+ALTER TABLE USERDATA ADD
+bySkill binary(10) NULL,
+byItem binary(400) NULL,
+bySerial binary(400) NULL;
+GO
+
+-- Implicit conversion from data type varchar to binary is not allowed.
+UPDATE USERDATA SET bySkill = CONVERT(binary, strSkill);
+
+-- Note that there is no need to convert these two below to binary, since they were already binary
+-- and someone forgot or didn't bother to rename them.
+UPDATE USERDATA SET byItem = strItem;
+UPDATE USERDATA SET bySerial = strSerial;
+GO
+
+-- Done reworking these columns? let's get ride of them.
+ALTER TABLE USERDATA DROP COLUMN strSkill;
+ALTER TABLE USERDATA DROP COLUMN strItem;
+ALTER TABLE USERDATA DROP COLUMN strSerial;
+GO

src/migration/10_fix_userdata_columns.sql.diff

@@ -0,0 +1,23 @@
+diff --git a/src/schema/USERDATA.sql b/src/schema/USERDATA.sql
+index 9b40bd9..53d47b4 100644
+--- a/src/schema/USERDATA.sql
++++ b/src/schema/USERDATA.sql
+@@ -34,9 +34,9 @@ CREATE TABLE [dbo].[USERDATA](
+ 	[PZ] [int] NOT NULL,
+ 	[PY] [int] NOT NULL,
+ 	[dwTime] [int] NOT NULL,
+-	[strSkill] [varchar](10) NULL,
+-	[strItem] [binary](400) NULL,
+-	[strSerial] [binary](400) NULL,
++	[bySkill] [binary](10) NULL,
++	[byItem] [binary](400) NULL,
++	[bySerial] [binary](400) NULL,
+  CONSTRAINT [PK_USERDATA] PRIMARY KEY CLUSTERED 
+ (
+ 	[strUserId] ASC
+@@ -106,5 +106,3 @@ ALTER TABLE [dbo].[USERDATA] ADD  CONSTRAINT [DF_USERDATA_PY]  DEFAULT ((0)) FOR
+ GO
+ ALTER TABLE [dbo].[USERDATA] ADD  CONSTRAINT [DF_USERDATA_dwTime]  DEFAULT ((0)) FOR [dwTime]
+ GO
+-ALTER TABLE [dbo].[USERDATA] ADD  CONSTRAINT [DF_USERDATA_strSkill]  DEFAULT (0x00) FOR [strSkill]
+-GO

src/migration/11_alter_update_user_data_procedure.sql

@@ -0,0 +1,89 @@
+SET ANSI_NULLS OFF
+GO
+SET QUOTED_IDENTIFIER OFF
+GO
+ALTER PROCEDURE [dbo].[UPDATE_USER_DATA]
+  @id varchar(21),
+  @Nation tinyint,
+  @Race tinyint,
+  @Class smallint,
+  @HairColor tinyint,
+  @Rank tinyint,
+  @Title tinyint,
+  @Level tinyint,
+  @Exp int,
+  @Loyalty int,
+  @Face tinyint,
+  @City tinyint,
+  @Knights smallint,
+  @Fame tinyint,
+  @Hp smallint,
+  @Mp smallint,
+  @Sp smallint,
+  @Str tinyint,
+  @Sta tinyint,
+  @Dex tinyint,
+  @Intel tinyint,
+  @Cha tinyint,
+  @Authority tinyint,
+  @Points tinyint,
+  @Gold int,
+  @Zone tinyint,
+  @Bind smallint,
+  @PX int,
+  @PZ int,
+  @PY int,
+  @dwTime int,
+  @bySkill binary(10),
+  @byItem binary(400),
+  @bySerial binary(400)
+AS
+
+DECLARE @KnightsIndex smallint
+
+IF @Zone > 2		-- battle zone user
+  BEGIN
+    SELECT @KnightsIndex = Knights FROM USERDATA WHERE strUserId = @id
+    IF @KnightsIndex = -1	-- expel user
+      BEGIN
+        SET @Knights = 0
+        SET @Fame = 0
+      END
+  END
+
+UPDATE USERDATA
+SET
+  Nation = @Nation,
+  Race = @Race,
+  [Class] = @Class,
+  HairColor = @HairColor,
+  Rank = @Rank,
+  Title = @Title,
+  [Level] = @Level,
+  [Exp] = @Exp,
+  Loyalty = @Loyalty,
+  Face = @Face,
+  City = @City,
+  Knights = @Knights,
+  Fame = @Fame,
+  Hp = @Hp,
+  Mp = @Mp,
+  Sp = @Sp,
+  Strong = @Str,
+  Sta = @Sta,
+  Dex = @Dex,
+  Intel = @Intel,
+  Cha = @Cha,
+  Authority = @Authority,
+  Points = @Points,
+  Gold = @Gold,
+  [Zone] = @Zone,
+  Bind = @Bind,
+  PX = @PX,
+  PZ = @PZ,
+  PY = @PY,
+  dwTime = @dwTime,
+  bySkill = @bySkill,
+  byItem = @byItem,
+  bySerial = @bySerial
+WHERE strUserId = @id

src/migration/11_alter_update_user_data_procedure.sql.diff

@@ -0,0 +1,30 @@
+diff --git a/src/procedure/UPDATE_USER_DATA.sql b/src/procedure/UPDATE_USER_DATA.sql
+index dcb8da3..5279adf 100644
+--- a/src/procedure/UPDATE_USER_DATA.sql
++++ b/src/procedure/UPDATE_USER_DATA.sql
+@@ -34,9 +34,9 @@ CREATE PROCEDURE [dbo].[UPDATE_USER_DATA]
+   @PZ int,
+   @PY int,
+   @dwTime int,
+-  @strSkill varchar(20),
+-  @strItem binary(400),
+-  @strSerial binary(400)
++  @bySkill binary(10),
++  @byItem binary(400),
++  @bySerial binary(400)
+ AS
+ 
+ DECLARE @KnightsIndex smallint
+@@ -83,9 +83,9 @@ SET
+   PZ = @PZ,
+   PY = @PY,
+   dwTime = @dwTime,
+-  strSkill = @strSkill,
+-  strItem = @strItem,
+-  strSerial = @strSerial
++  bySkill = @bySkill,
++  byItem = @byItem,
++  bySerial = @bySerial
+ WHERE strUserId = @id
+ 
+ GO

src/migration/12_alter_load_char_info_procedure.sql

@@ -0,0 +1,28 @@
+SET ANSI_NULLS OFF
+GO
+SET QUOTED_IDENTIFIER ON
+GO
+-- Scripted by Samma
+-- 2002.01.18
+
+ALTER PROCEDURE [dbo].[LOAD_CHAR_INFO]
+  @CharId char(21),
+  @nRet smallint OUTPUT
+AS
+
+SELECT @nRet = COUNT(strUserId) FROM USERDATA WHERE strUserId = @CharId
+IF @nRet = 0
+  RETURN
+
+  SELECT
+    Race,
+    [Class],
+    HairColor,
+    [Level],
+    Face,
+    Zone,
+    byItem
+  FROM USERDATA WHERE strUserID = @CharId
+
+SET @nRet = 1
+RETURN

src/migration/12_alter_load_char_info_procedure.sql.diff

@@ -0,0 +1,13 @@
+diff --git a/src/procedure/LOAD_CHAR_INFO.sql b/src/procedure/LOAD_CHAR_INFO.sql
+index 84cd4f0..6e70027 100644
+--- a/src/procedure/LOAD_CHAR_INFO.sql
++++ b/src/procedure/LOAD_CHAR_INFO.sql
+@@ -21,7 +21,7 @@ IF @nRet = 0
+     [Level],
+     Face,
+     Zone,
+-    strItem
++    byItem
+   FROM USERDATA WHERE strUserID = @CharId
+ 
+ SET @nRet = 1

src/migration/13_alter_load_user_data_procedure.sql

@@ -0,0 +1,55 @@
+SET ANSI_NULLS ON
+GO
+SET QUOTED_IDENTIFIER OFF
+GO
+
+
+ALTER PROCEDURE [dbo].[LOAD_USER_DATA]
+  @id char(21),
+  @nRet smallint OUTPUT
+AS
+
+SET @nRet = 0
+
+SELECT @nRet = COUNT(strUserId) FROM USERDATA WHERE strUserId = @id
+IF @nRet = 0
+  RETURN
+
+  SELECT
+    Nation,
+    Race,
+    [Class],
+    HairColor,
+    Rank,
+    Title,
+    [Level],
+    [Exp],
+    Loyalty,
+    Face,
+    City,
+    Knights,
+    Fame,
+    Hp,
+    Mp,
+    Sp,
+    Strong,
+    Sta,
+    Dex,
+    Intel,
+    Cha,
+    Authority,
+    Points,
+    Gold,
+    [Zone],
+    Bind,
+    PX,
+    PZ,
+    PY,
+    dwTime,
+    bySkill,
+    byItem,
+    bySerial
+  FROM USERDATA WHERE strUserId = @id
+
+SET @nRet = 1
+RETURN

src/migration/13_alter_load_user_data_procedure.sql.diff

@@ -0,0 +1,17 @@
+diff --git a/src/procedure/LOAD_USER_DATA.sql b/src/procedure/LOAD_USER_DATA.sql
+index 4a33232..11a266e 100644
+--- a/src/procedure/LOAD_USER_DATA.sql
++++ b/src/procedure/LOAD_USER_DATA.sql
+@@ -46,9 +46,9 @@ IF @nRet = 0
+     PZ,
+     PY,
+     dwTime,
+-    strSkill,
+-    strItem,
+-    strSerial
++    bySkill,
++    byItem,
++    bySerial
+   FROM USERDATA WHERE strUserId = @id
+ 
+ SET @nRet = 1