Merge pull request #21 from ko4life-net/release/1.0.0

Initial release 1.0.0.
ko4life-net · Apr 30, 2024 · 4bf1b11 · 4bf1b11
2 parents 2c22624 + a8a6b46
commit 4bf1b11
Show file tree

Hide file tree

Showing 100 changed files with 458 additions and 2,564 deletions.
diff --git a/src/data/BK_FRI_USERDATA.sql b/src/data/BK_FRI_USERDATA.sql
diff --git a/src/data/BK_FRI_WAREHOUSE.sql b/src/data/BK_FRI_WAREHOUSE.sql
diff --git a/src/data/BK_MON_USERDATA.sql b/src/data/BK_MON_USERDATA.sql
diff --git a/src/data/BK_MON_WAREHOUSE.sql b/src/data/BK_MON_WAREHOUSE.sql
diff --git a/src/data/BK_SAT_USERDATA.sql b/src/data/BK_SAT_USERDATA.sql
diff --git a/src/data/BK_SAT_WAREHOUSE.sql b/src/data/BK_SAT_WAREHOUSE.sql
diff --git a/src/data/BK_SUN_USERDATA.sql b/src/data/BK_SUN_USERDATA.sql
diff --git a/src/data/BK_SUN_WAREHOUSE.sql b/src/data/BK_SUN_WAREHOUSE.sql
diff --git a/src/data/BK_THU_USERDATA.sql b/src/data/BK_THU_USERDATA.sql
diff --git a/src/data/BK_THU_WAREHOUSE.sql b/src/data/BK_THU_WAREHOUSE.sql
diff --git a/src/data/BK_TUE_USERDATA.sql b/src/data/BK_TUE_USERDATA.sql
diff --git a/src/data/BK_TUE_WAREHOUSE.sql b/src/data/BK_TUE_WAREHOUSE.sql
diff --git a/src/data/BK_WED_USERDATA.sql b/src/data/BK_WED_USERDATA.sql
diff --git a/src/data/BK_WED_WAREHOUSE.sql b/src/data/BK_WED_WAREHOUSE.sql
diff --git a/src/data/BLOCKED_USERDATA.sql b/src/data/BLOCKED_USERDATA.sql
diff --git a/src/data/BLOCKED_WAREHOUSE.sql b/src/data/BLOCKED_WAREHOUSE.sql
diff --git a/src/data/K_MONSTER.sql b/src/data/K_MONSTER.sql
diff --git a/src/data/K_NPC.sql b/src/data/K_NPC.sql
diff --git a/src/data/K_NPCPOS_BACK.sql b/src/data/K_NPCPOS_BACK.sql
diff --git a/src/data/K_NPCPOS_SORT.sql b/src/data/K_NPCPOS_SORT.sql
diff --git a/src/data/MONSTER_ITEM_TEST.sql b/src/data/MONSTER_ITEM_TEST.sql
diff --git a/src/data/TB_USER.sql b/src/data/TB_USER.sql
@@ -1 +1 @@
-
+INSERT [dbo].[TB_USER] ([strAccountID], [strPasswd], [strSocNo]) VALUES (N'steve', N'1', N'1              ')
diff --git a/src/migration/README.md b/src/migration/README.md
@@ -13,13 +13,14 @@ Couple of rules and notes when writing migration scripts:
 ## Creating a new release
 
 Below are instructions for the release engineer in order to create a new db release:
-- Create a new release branch following the db new release version according version semantics (`git checkout release/1.0.1`)
+- Create a new release branch following the db new release version according version semantics (`git checkout -b release/1.0.1`)
 - Run the import script skipping the migration scripts (`.\import.ps1 -run_migration_scripts $false`)
 - Run the export script, to be sure that no diff is produced (`.\export.ps1` and then `git status`)
   - If there are local changes, something is probably off. Repeat the steps above
   - If you're sure all in order, best is if you create a new separate PR with the changes, in case empty spaces and such were added
-- Run the import script again without the migration scripts and produce diffs (`.\import.ps1 -generate_diffs $true`)
+- Run the import script again with the migration scripts and produce diffs (`.\import.ps1 -generate_diffs $true`)
 - Move all migration scripts and its `*.diff` files to the `archived` directory
+- Lastly run the export script once more, but this time you'll have the actual changes from the migration scripts affecting the actual schema
 - Git commit all the changes (`Bump version from 1.0.0 to 1.0.1`)
   - Check the final diff that all looks in order
 - Create a PR and merge after approval

diff --git a/src/migration/10_fix_userdata_columns.sql → ...ation/archive/10_fix_userdata_columns.sql b/src/migration/10_fix_userdata_columns.sql → ...ation/archive/10_fix_userdata_columns.sql
diff --git a/...igration/10_fix_userdata_columns.sql.diff → .../archive/10_fix_userdata_columns.sql.diff b/...igration/10_fix_userdata_columns.sql.diff → .../archive/10_fix_userdata_columns.sql.diff
diff --git a/...n/11_alter_update_user_data_procedure.sql → ...e/11_alter_update_user_data_procedure.sql b/...n/11_alter_update_user_data_procedure.sql → ...e/11_alter_update_user_data_procedure.sql
diff --git a/...alter_update_user_data_procedure.sql.diff → ...alter_update_user_data_procedure.sql.diff b/...alter_update_user_data_procedure.sql.diff → ...alter_update_user_data_procedure.sql.diff
diff --git a/...ion/12_alter_load_char_info_procedure.sql → ...ive/12_alter_load_char_info_procedure.sql b/...ion/12_alter_load_char_info_procedure.sql → ...ive/12_alter_load_char_info_procedure.sql
diff --git a/...2_alter_load_char_info_procedure.sql.diff → ...2_alter_load_char_info_procedure.sql.diff b/...2_alter_load_char_info_procedure.sql.diff → ...2_alter_load_char_info_procedure.sql.diff
diff --git a/...ion/13_alter_load_user_data_procedure.sql → ...ive/13_alter_load_user_data_procedure.sql b/...ion/13_alter_load_user_data_procedure.sql → ...ive/13_alter_load_user_data_procedure.sql
diff --git a/...3_alter_load_user_data_procedure.sql.diff → ...3_alter_load_user_data_procedure.sql.diff b/...3_alter_load_user_data_procedure.sql.diff → ...3_alter_load_user_data_procedure.sql.diff
diff --git a/...tion/14_alter_deleted_userdata_schema.sql → ...hive/14_alter_deleted_userdata_schema.sql b/...tion/14_alter_deleted_userdata_schema.sql → ...hive/14_alter_deleted_userdata_schema.sql
diff --git a/...14_alter_deleted_userdata_schema.sql.diff → ...14_alter_deleted_userdata_schema.sql.diff b/...14_alter_deleted_userdata_schema.sql.diff → ...14_alter_deleted_userdata_schema.sql.diff
diff --git a/...ration/15_alter_delete_char_procedure.sql → ...rchive/15_alter_delete_char_procedure.sql b/...ration/15_alter_delete_char_procedure.sql → ...rchive/15_alter_delete_char_procedure.sql
diff --git a/...n/15_alter_delete_char_procedure.sql.diff → ...e/15_alter_delete_char_procedure.sql.diff b/...n/15_alter_delete_char_procedure.sql.diff → ...e/15_alter_delete_char_procedure.sql.diff
diff --git a/...tion/16_alter_warehouse_table_columns.sql → ...hive/16_alter_warehouse_table_columns.sql b/...tion/16_alter_warehouse_table_columns.sql → ...hive/16_alter_warehouse_table_columns.sql
diff --git a/...16_alter_warehouse_table_columns.sql.diff → ...16_alter_warehouse_table_columns.sql.diff b/...16_alter_warehouse_table_columns.sql.diff → ...16_alter_warehouse_table_columns.sql.diff
diff --git a/...igration/17_alter_warehouse_procedure.sql → .../archive/17_alter_warehouse_procedure.sql b/...igration/17_alter_warehouse_procedure.sql → .../archive/17_alter_warehouse_procedure.sql
diff --git a/...ion/17_alter_warehouse_procedure.sql.diff → ...ive/17_alter_warehouse_procedure.sql.diff b/...ion/17_alter_warehouse_procedure.sql.diff → ...ive/17_alter_warehouse_procedure.sql.diff
diff --git a/src/migration/1_fix_aiserver_columns.sql → ...ration/archive/1_fix_aiserver_columns.sql b/src/migration/1_fix_aiserver_columns.sql → ...ration/archive/1_fix_aiserver_columns.sql
diff --git a/...migration/1_fix_aiserver_columns.sql.diff → ...n/archive/1_fix_aiserver_columns.sql.diff b/...migration/1_fix_aiserver_columns.sql.diff → ...n/archive/1_fix_aiserver_columns.sql.diff
diff --git a/src/migration/2_insert_steve.sql → src/migration/archive/2_insert_steve.sql b/src/migration/2_insert_steve.sql → src/migration/archive/2_insert_steve.sql
diff --git a/src/migration/2_insert_steve.sql.diff → ...migration/archive/2_insert_steve.sql.diff b/src/migration/2_insert_steve.sql.diff → ...migration/archive/2_insert_steve.sql.diff
diff --git a/...ation/3_alter_account_login_procedure.sql → ...chive/3_alter_account_login_procedure.sql b/...ation/3_alter_account_login_procedure.sql → ...chive/3_alter_account_login_procedure.sql
diff --git a/.../3_alter_account_login_procedure.sql.diff → .../3_alter_account_login_procedure.sql.diff b/.../3_alter_account_login_procedure.sql.diff → .../3_alter_account_login_procedure.sql.diff
diff --git a/...ration/4_create_char_select_procedure.sql → ...rchive/4_create_char_select_procedure.sql b/...ration/4_create_char_select_procedure.sql → ...rchive/4_create_char_select_procedure.sql
diff --git a/...n/4_create_char_select_procedure.sql.diff → ...e/4_create_char_select_procedure.sql.diff b/...n/4_create_char_select_procedure.sql.diff → ...e/4_create_char_select_procedure.sql.diff
diff --git a/...tion/5_alter_load_char_info_procedure.sql → ...hive/5_alter_load_char_info_procedure.sql b/...tion/5_alter_load_char_info_procedure.sql → ...hive/5_alter_load_char_info_procedure.sql
diff --git a/...5_alter_load_char_info_procedure.sql.diff → ...5_alter_load_char_info_procedure.sql.diff b/...5_alter_load_char_info_procedure.sql.diff → ...5_alter_load_char_info_procedure.sql.diff
diff --git a/...tion/6_alter_load_user_data_procedure.sql → ...hive/6_alter_load_user_data_procedure.sql b/...tion/6_alter_load_user_data_procedure.sql → ...hive/6_alter_load_user_data_procedure.sql
diff --git a/...6_alter_load_user_data_procedure.sql.diff → ...6_alter_load_user_data_procedure.sql.diff b/...6_alter_load_user_data_procedure.sql.diff → ...6_alter_load_user_data_procedure.sql.diff
diff --git a/...ation/7_alter_nation_select_procedure.sql → ...chive/7_alter_nation_select_procedure.sql b/...ation/7_alter_nation_select_procedure.sql → ...chive/7_alter_nation_select_procedure.sql
diff --git a/.../7_alter_nation_select_procedure.sql.diff → .../7_alter_nation_select_procedure.sql.diff b/.../7_alter_nation_select_procedure.sql.diff → .../7_alter_nation_select_procedure.sql.diff
diff --git a/src/migration/8_alter_account_login.sql → ...gration/archive/8_alter_account_login.sql b/src/migration/8_alter_account_login.sql → ...gration/archive/8_alter_account_login.sql
diff --git a/src/migration/8_alter_account_login.sql.diff → ...on/archive/8_alter_account_login.sql.diff b/src/migration/8_alter_account_login.sql.diff → ...on/archive/8_alter_account_login.sql.diff
diff --git a/...n/9_drop_unused_tables_and_procedures.sql → ...e/9_drop_unused_tables_and_procedures.sql b/...n/9_drop_unused_tables_and_procedures.sql → ...e/9_drop_unused_tables_and_procedures.sql
diff --git a/...rop_unused_tables_and_procedures.sql.diff → ...rop_unused_tables_and_procedures.sql.diff b/...rop_unused_tables_and_procedures.sql.diff → ...rop_unused_tables_and_procedures.sql.diff
diff --git a/src/procedure/ACCOUNT_LOGIN.sql b/src/procedure/ACCOUNT_LOGIN.sql
@@ -1,6 +1,6 @@
-SET ANSI_NULLS OFF
+SET ANSI_NULLS ON
 GO
-SET QUOTED_IDENTIFIER ON
+SET QUOTED_IDENTIFIER OFF
 GO
 CREATE PROCEDURE [dbo].[ACCOUNT_LOGIN]
   @AccountID varchar(21),
@@ -9,46 +9,27 @@ CREATE PROCEDURE [dbo].[ACCOUNT_LOGIN]
 
 AS
 
-
-DECLARE @Nation tinyint, @CharNum smallint
-SET @Nation = 0
-SET @CharNum = 0
-
 DECLARE @pwd varchar(13)
 
 SET @pwd = NULL
 
 SELECT @pwd = strPasswd FROM [dbo].[TB_USER] WHERE strAccountID = @AccountID
 IF @pwd IS NULL
   BEGIN
-    SET @nRet = 0
+    BEGIN TRAN
+    INSERT INTO TB_USER (strAccountID, strPasswd, strSocNo)
+    VALUES (@AccountID, @Password, 1)
+    COMMIT TRAN
+    SET @nRet = 1
     RETURN
   END
 
 ELSE IF @pwd != @Password
   BEGIN
-    SET @nRet = 0
+    SET @nRet = 3
     RETURN
   END
 
-SELECT
-  @Nation = bNation,
-  @CharNum = bCharNum
-FROM ACCOUNT_CHAR WHERE strAccountID = @AccountID
-IF @@ROWCOUNT = 0
-  BEGIN
-    SET @nRet = 1
-    RETURN
-  END
-IF @CharNum = 0
-  BEGIN
-    SET @nRet = 1
-    RETURN
-  END
-ELSE
-  BEGIN
-    SET @nRet = @Nation + 1
-    RETURN
-  END
+SET @nRet = 1 -- success
 
 GO
diff --git a/src/procedure/BACKUP_FRI.sql b/src/procedure/BACKUP_FRI.sql
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@

		INSERT [dbo].[TB_USER] ([strAccountID], [strPasswd], [strSocNo]) VALUES (N'steve', N'1', N'1 ')