Skip to content

Commit cec59bc

Browse files
committed
Merge pull request #23 from ko4life-net/release/1.0.1
Bump version from 1.0.0 to 1.0.1.
2 parents b7a3082 + 35751af commit cec59bc

20 files changed

+40
-95
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0
1+
1.0.1

src/migration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Below are instructions for the release engineer in order to create a new db rele
2121
- Run the import script again with the migration scripts and produce diffs (`.\import.ps1 -generate_diffs $true`)
2222
- Move all migration scripts and its `*.diff` files to the `archived` directory
2323
- Lastly run the export script once more, but this time you'll have the actual changes from the migration scripts affecting the actual schema
24-
- Git commit all the changes (`Bump version from 1.0.0 to 1.0.1`)
24+
- Git commit all the changes (`Bump version from 1.0.0 to 1.0.1.`)
2525
- Check the final diff that all looks in order
2626
- Create a PR and merge after approval
2727
- After merging, create a new release using GitHub web interface and add description to the release highlighting the important changes

src/procedure/CHECK_KNIGHTS.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ SELECT IDNum FROM KNIGHTS
1515
OPEN job1
1616
FETCH NEXT FROM job1
1717
INTO @KnightsIndex
18-
WHILE @@fetch_status = 0
18+
WHILE @@FETCH_STATUS = 0
1919
BEGIN
2020
DECLARE @ROW int
2121

2222
SELECT @ROW = Members FROM [KNIGHTS] WHERE [IDNum] = @KnightsIndex
2323
IF @ROW = 1
2424
BEGIN
2525
BEGIN TRAN
26-
DELETE FROM KNIGHTS WHERE IDNum = @knightsindex
26+
DELETE FROM KNIGHTS WHERE IDNum = @KnightsIndex
2727

2828
IF @@ERROR != 0
2929
BEGIN
3030
ROLLBACK TRAN
3131
END
3232
ELSE
3333
BEGIN
34-
UPDATE USERDATA SET Knights = 0, Fame = 0 WHERE Knights = @knightsindex
34+
UPDATE USERDATA SET Knights = 0, Fame = 0 WHERE Knights = @KnightsIndex
3535
DELETE FROM KNIGHTS_USER WHERE [sIDNum] = @KnightsIndex
3636
END
3737
COMMIT TRAN

src/procedure/CREATE_KNIGHTS.sql

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@ SET QUOTED_IDENTIFIER ON
44
GO
55

66
CREATE PROCEDURE [dbo].[CREATE_KNIGHTS]
7-
87
@nRet smallint OUTPUT,
98
@index smallint,
109
@nation tinyint,
1110
@community tinyint,
1211
@strName char(21),
1312
@strChief char(21)
14-
1513
AS
1614

17-
DECLARE @Row tinyint, @knightsindex smallint, @knightsname char(21)
18-
SET @Row = 0 SET @knightsindex = 0 SET @knightsname = ''
15+
DECLARE @Row tinyint, @KnightsIndex smallint, @KnightsName char(21)
16+
SET @Row = 0 SET @KnightsIndex = 0 SET @KnightsName = ''
1917

2018
SELECT @Row = COUNT(*) FROM KNIGHTS WHERE IDNum = @index OR IDName = @strName
2119

src/procedure/CREATE_KNIGHTS2.sql

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/procedure/DELETE_CHAR.sql

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ DECLARE
1818
@charid4 char(21),
1919
@charid5 char(21),
2020
@strSocNo char(15)
21-
DECLARE @knightsindex smallint
21+
DECLARE @KnightsIndex smallint
2222
SET @bCharNum = 0
23-
SET @knightsindex = 0
23+
SET @KnightsIndex = 0
2424

2525
SELECT @strSocNo = strSocNo FROM [dbo].[TB_USER] WHERE strAccountID = @AccountID
2626
IF @SocNo != @strSocNo
@@ -67,15 +67,15 @@ DECLARE @bySkill binary(10), @byItem binary(400), @bySerial binary(400), @Member
6767
BEGIN TRAN
6868

6969
IF @index = 0
70-
UPDATE ACCOUNT_CHAR SET strCHARID1 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
70+
UPDATE ACCOUNT_CHAR SET strCharID1 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
7171
IF @index = 1
72-
UPDATE ACCOUNT_CHAR SET strCHARID2 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
72+
UPDATE ACCOUNT_CHAR SET strCharID2 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
7373
IF @index = 2
74-
UPDATE ACCOUNT_CHAR SET strCHARID3 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
74+
UPDATE ACCOUNT_CHAR SET strCharID3 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
7575
IF @index = 3
76-
UPDATE ACCOUNT_CHAR SET strCHARID4 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
76+
UPDATE ACCOUNT_CHAR SET strCharID4 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
7777
IF @index = 4
78-
UPDATE ACCOUNT_CHAR SET strCHARID5 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
78+
UPDATE ACCOUNT_CHAR SET strCharID5 = NULL, bCharNum = bCharNum - 1 WHERE strAccountID = @AccountID
7979

8080
IF @@ERROR != 0
8181
BEGIN
@@ -85,11 +85,11 @@ IF @@ERROR != 0
8585
END
8686

8787
SELECT
88-
@charid1 = strCHARID1,
89-
@charid2 = strCHARID2,
90-
@charid3 = strCHARID3,
91-
@charid4 = strCHARID4,
92-
@charid5 = strCHARID5
88+
@charid1 = strCharID1,
89+
@charid2 = strCharID2,
90+
@charid3 = strCharID3,
91+
@charid4 = strCharID4,
92+
@charid5 = strCharID5
9393
FROM ACCOUNT_CHAR
9494
WHERE strAccountID = @AccountID
9595
-- 캐릭터가 하나도 없으면 해당 레코드를 지운다.. -> 국가선택 다시 할수 있다
@@ -142,7 +142,7 @@ FROM USERDATA WHERE strUserId = @CharID
142142

143143
INSERT INTO DELETED_USERDATA (
144144
strAccountID,
145-
strUserID,
145+
strUserId,
146146
Nation,
147147
Race,
148148
[Class],
@@ -223,7 +223,7 @@ IF @@ERROR != 0
223223
RETURN
224224
END
225225

226-
DELETE FROM KNIGHTS_USER WHERE strUserId = @CharID
226+
DELETE FROM KNIGHTS_USER WHERE strUserID = @CharID
227227
SELECT @Members = Members FROM KNIGHTS WHERE IDNum = @Knights
228228
IF @Members <= 1
229229
UPDATE KNIGHTS SET Members = 1 WHERE IDNum = @Knights

src/procedure/DELETE_KNIGHTS.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ GO
66

77
CREATE PROCEDURE [dbo].[DELETE_KNIGHTS]
88
@nRet smallint OUTPUT,
9-
@knightsindex smallint
9+
@KnightsIndex smallint
1010
AS
1111

1212
DECLARE @Row tinyint, @Knights smallint, @Fame tinyint, @UserID char(21)
1313
SET @Row = 0 SET @Knights = 0 SET @Fame = 0 SET @UserID = ''
1414

1515

1616

17-
SELECT @Row = COUNT(*) FROM KNIGHTS WHERE IDNum = @knightsindex
17+
SELECT @Row = COUNT(*) FROM KNIGHTS WHERE IDNum = @KnightsIndex
1818
IF @Row = 0
1919
BEGIN
2020
SET @nRet = 7
@@ -23,8 +23,8 @@ IF @Row = 0
2323

2424
BEGIN TRAN
2525

26-
DELETE FROM KNIGHTS WHERE IDNum = @knightsindex
27-
DELETE FROM KNIGHTS_USER WHERE sIDNum = @knightsindex
26+
DELETE FROM KNIGHTS WHERE IDNum = @KnightsIndex
27+
DELETE FROM KNIGHTS_USER WHERE sIDNum = @KnightsIndex
2828

2929
IF @@ERROR != 0
3030
BEGIN

src/procedure/EDITER_KNIGHTS.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SELECT IDNum FROM KNIGHTS
1717
OPEN job1
1818
FETCH NEXT FROM job1
1919
INTO @KnightsIndex
20-
WHILE @@fetch_status = 0
20+
WHILE @@FETCH_STATUS = 0
2121
BEGIN
2222
DECLARE @LEVEL int
2323
DECLARE @ROW int
@@ -26,11 +26,11 @@ WHILE @@fetch_status = 0
2626
SELECT @ROW = COUNT([strUserId]) FROM [USERDATA] WHERE Knights = @KnightsIndex
2727
IF @ROW != 0
2828
BEGIN
29-
UPDATE KNIGHTS SET [Members] = @Row WHERE IDNum = @KnightsIndex
29+
UPDATE KNIGHTS SET [Members] = @ROW WHERE IDNum = @KnightsIndex
3030
END
3131
ELSE
3232
BEGIN
33-
DELETE FROM KNIGHTS WHERE IDNum = @knightsindex
33+
DELETE FROM KNIGHTS WHERE IDNum = @KnightsIndex
3434
END
3535

3636
FETCH NEXT FROM job1

src/procedure/EXEC_KNIGHTS_USER.sql

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ CREATE PROCEDURE [dbo].[EXEC_KNIGHTS_USER]
99
AS
1010

1111
SET NOCOUNT ON
12-
DECLARE @strUserID char(21)
12+
DECLARE @strUserId char(21)
1313
DECLARE @KnightsIndex smallint
1414
DECLARE job1 CURSOR FOR
1515

1616
SELECT
17-
strUserID,
17+
strUserId,
1818
Knights
1919
FROM USERDATA
2020

2121
OPEN job1
2222
FETCH NEXT FROM job1
23-
INTO @strUserID, @KnightsIndex
24-
WHILE @@fetch_status = 0
23+
INTO @strUserId, @KnightsIndex
24+
WHILE @@FETCH_STATUS = 0
2525
BEGIN
2626
IF @KnightsIndex != 0
2727
BEGIN
28-
INSERT INTO KNIGHTS_USER (sIDNum, strUserID) VALUES (@KnightsIndex, @strUserID)
28+
INSERT INTO KNIGHTS_USER (sIDNum, strUserID) VALUES (@KnightsIndex, @strUserId)
2929
END
3030

3131
FETCH NEXT FROM job1
32-
INTO @strUserID, @KnightsIndex
32+
INTO @strUserId, @KnightsIndex
3333
END
3434
CLOSE job1
3535
DEALLOCATE job1

src/procedure/LOAD_CHAR_INFO.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ IF @nRet = 0
2222
Face,
2323
Zone,
2424
byItem
25-
FROM USERDATA WHERE strUserID = @CharId
25+
FROM USERDATA WHERE strUserId = @CharId
2626

2727
SET @nRet = 1
2828
RETURN

src/procedure/LOAD_KNIGHTS_MEMBERS.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ GO
77
-- 2002.09.26
88

99
CREATE PROCEDURE [dbo].[LOAD_KNIGHTS_MEMBERS]
10-
@knightsindex smallint
10+
@KnightsIndex smallint
1111
AS
1212

1313
SELECT
1414
strUserId,
1515
Fame,
1616
[Level],
1717
[Class]
18-
FROM USERDATA WHERE Knights = @knightsindex
18+
FROM USERDATA WHERE Knights = @KnightsIndex
1919

2020
--SET @nRet = 1
2121
--RETURN

src/procedure/RANK_KNIGHTS.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ SELECT IDNum FROM KNIGHTS
1717
OPEN job1
1818
FETCH NEXT FROM job1
1919
INTO @KnightsIndex
20-
WHILE @@fetch_status = 0
20+
WHILE @@FETCH_STATUS = 0
2121
BEGIN
2222

2323
SET @SumLoyalty = 0
24-
SELECT @SumLoyalty = SUM(Loyalty) FROM USERDATA WHERE Knights = @Knightsindex
24+
SELECT @SumLoyalty = SUM(Loyalty) FROM USERDATA WHERE Knights = @KnightsIndex
2525
IF @SumLoyalty != 0
26-
UPDATE KNIGHTS SET Points = @SumLoyalty WHERE IDNum = @knightsindex
26+
UPDATE KNIGHTS SET Points = @SumLoyalty WHERE IDNum = @KnightsIndex
2727

2828
FETCH NEXT FROM job1
2929
INTO @KnightsIndex

0 commit comments

Comments
 (0)