Browse Source

Fix #161 - overwriting castle and clanhall tables during update

disKret 19 years ago
parent
commit
be855b89f5
2 changed files with 32 additions and 34 deletions
  1. 1 2
      datapack_development/sql/castle.sql
  2. 31 32
      datapack_development/sql/clanhall.sql

+ 1 - 2
datapack_development/sql/castle.sql

@@ -1,8 +1,7 @@
 -- ---------------------------
 -- ---------------------------
 -- Table structure for castle
 -- Table structure for castle
 -- ---------------------------
 -- ---------------------------
-DROP TABLE IF EXISTS castle;
-CREATE TABLE castle (
+CREATE TABLE IF NOT EXISTS castle (
   id INT NOT NULL default 0,
   id INT NOT NULL default 0,
   name varchar(25) NOT NULL,
   name varchar(25) NOT NULL,
   taxPercent INT NOT NULL default 15,
   taxPercent INT NOT NULL default 15,

+ 31 - 32
datapack_development/sql/clanhall.sql

@@ -1,8 +1,7 @@
 -- ---------------------------
 -- ---------------------------
 -- Table structure for clanhall
 -- Table structure for clanhall
 -- ---------------------------
 -- ---------------------------
-DROP TABLE IF EXISTS clanhall;
-CREATE TABLE clanhall (
+CREATE TABLE IF NOT EXISTS clanhall (
   id INT NOT NULL default 0,
   id INT NOT NULL default 0,
   name varchar(40) NOT NULL,
   name varchar(40) NOT NULL,
   ownerId INT NOT NULL default 0,
   ownerId INT NOT NULL default 0,
@@ -10,33 +9,33 @@ CREATE TABLE clanhall (
   KEY id (id)
   KEY id (id)
 );
 );
 
 
-insert into clanhall values (1, 'Gludio 1', 0);
-insert into clanhall values (2, 'Gludio 2', 0);
-insert into clanhall values (3, 'Gludio 3', 0);
-insert into clanhall values (4, 'Gludio 4', 0);
-insert into clanhall values (5, 'Gludin 1', 0);
-insert into clanhall values (6, 'Gludin 2', 0);
-insert into clanhall values (7, 'Gludin 3', 0);
-insert into clanhall values (8, 'Gludin 4', 0);
-insert into clanhall values (9, 'Gludin 5', 0);
-insert into clanhall values (10, 'Dion 1', 0);
-insert into clanhall values (11, 'Dion 2', 0);
-insert into clanhall values (12, 'Dion 3', 0);
-insert into clanhall values (13, 'Giran 1', 0);
-insert into clanhall values (14, 'Giran 2', 0);
-insert into clanhall values (15, 'Giran 3', 0);
-insert into clanhall values (16, 'Giran 4', 0);
-insert into clanhall values (17, 'Giran 5', 0);
-insert into clanhall values (18, 'Aden 1', 0);
-insert into clanhall values (19, 'Aden 2', 0);
-insert into clanhall values (20, 'Aden 3', 0);
-insert into clanhall values (21, 'Aden 4', 0);
-insert into clanhall values (22, 'Aden 5', 0);
-insert into clanhall values (23, 'Aden 6', 0);
-insert into clanhall values (24, 'Goddard 1', 0);
-insert into clanhall values (25, 'Goddard 2', 0);
-insert into clanhall values (26, 'Goddard 3', 0);
-insert into clanhall values (27, 'Goddard 4', 0);
-insert into clanhall values (28, 'Bandits Stronghold', 0);
-insert into clanhall values (29, 'Partisan Hideaway', 0);
-insert into clanhall values (30, 'Hot Springs Guild House', 0);
+INSERT IGNORE INTO `clanhall` VALUES (1, 'Gludio 1', 0),
+(2, 'Gludio 2', 0),
+(3, 'Gludio 3', 0),
+(4, 'Gludio 4', 0),
+(5, 'Gludin 1', 0),
+(6, 'Gludin 2', 0),
+(7, 'Gludin 3', 0),
+(8, 'Gludin 4', 0),
+(9, 'Gludin 5', 0),
+(10, 'Dion 1', 0),
+(11, 'Dion 2', 0),
+(12, 'Dion 3', 0),
+(13, 'Giran 1', 0),
+(14, 'Giran 2', 0),
+(15, 'Giran 3', 0),
+(16, 'Giran 4', 0),
+(17, 'Giran 5', 0),
+(18, 'Aden 1', 0),
+(19, 'Aden 2', 0),
+(20, 'Aden 3', 0),
+(21, 'Aden 4', 0),
+(22, 'Aden 5', 0),
+(23, 'Aden 6', 0),
+(24, 'Goddard 1', 0),
+(25, 'Goddard 2', 0),
+(26, 'Goddard 3', 0),
+(27, 'Goddard 4', 0),
+(28, 'Bandits Stronghold', 0),
+(29, 'Partisan Hideaway', 0),
+(30, 'Hot Springs Guild House', 0);