Browse Source

ignoring some errors for tables that contain existing character data

warrax 19 years ago
parent
commit
5a4d2885d5

+ 6 - 6
datapack_development/sql/castle.sql

@@ -13,9 +13,9 @@ CREATE TABLE IF NOT EXISTS castle (
   KEY id (id)
   KEY id (id)
 );
 );
 
 
-Insert Into castle Values (1, 'Gludio', 0, 0, 0, 7, 20);
-Insert Into castle Values (2, 'Dion', 0, 0, 0, 7, 20);
-Insert Into castle Values (3, 'Giran', 0, 0, 0, 1, 16);
-Insert Into castle Values (4, 'Oren', 0, 0, 0, 1, 16);
-Insert Into castle Values (5, 'Aden', 0, 0, 0, 7, 20);
-Insert Into castle Values (6, 'Innadril', 0, 0, 0, 1, 16);
+INSERT IGNORE INTO `castle` VALUES (1, 'Gludio', 0, 0, 0, 7, 20),
+(2, 'Dion', 0, 0, 0, 7, 20),
+(3, 'Giran', 0, 0, 0, 1, 16),
+(4, 'Oren', 0, 0, 0, 1, 16),
+(5, 'Aden', 0, 0, 0, 7, 20),
+(6, 'Innadril', 0, 0, 0, 1, 16);

+ 1 - 1
datapack_development/sql/seven_signs_festival.sql

@@ -10,7 +10,7 @@ CREATE TABLE IF NOT EXISTS `seven_signs_festival` (
 	`members` varchar(255) NOT NULL default '',
 	`members` varchar(255) NOT NULL default '',
 	PRIMARY KEY (`festivalId`,`cabal`,`cycle`));
 	PRIMARY KEY (`festivalId`,`cabal`,`cycle`));
 
 
-INSERT INTO `seven_signs_festival` VALUES 
+INSERT IGNORE INTO `seven_signs_festival` VALUES 
 (0, "dawn", 1, 0, 0, ""),
 (0, "dawn", 1, 0, 0, ""),
 (1, "dawn", 1, 0, 0, ""),
 (1, "dawn", 1, 0, 0, ""),
 (2, "dawn", 1, 0, 0, ""),
 (2, "dawn", 1, 0, 0, ""),

+ 2 - 1
datapack_development/tools/login_install.bat

@@ -25,4 +25,5 @@ echo Deleting tables for new content.
 echo.
 echo.
 echo Installling new content.
 echo Installling new content.
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/accounts.sql
 %mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/accounts.sql
-%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/gameservers.sql
+%mysqlPath% -h %DBHost% -u %user% --password=%pass% -D %DBname% < ../sql/gameservers.sql
+pause