This is part of a series of (simple but necessary) changes centered in pushing towards a naming convention and a coherent data model. Today, I'm moving any variation of char_id, obj_id, playerId... to '''charId'''. Affects characters and character_whatever tables, seven signs, hero/nobles and cursed weapon. Core [L2073] is required and despite my testings a backup is strongly recommended, since given the spread nature of these changes something may have been overlooked.

datapack_development/sql/character_friends.sql

@@ -2,8 +2,8 @@
 -- Table structure for character_friends
 -- ---------------------------- 
 CREATE TABLE IF NOT EXISTS `character_friends` ( 
-  `char_id` INT NOT NULL default 0,
-  `friend_id` INT(11) NOT NULL DEFAULT 0,
+  `charId` INT UNSIGNED NOT NULL default 0,
+  `friendId` INT UNSIGNED NOT NULL DEFAULT 0,
   `friend_name` VARCHAR(35) NOT NULL DEFAULT '',
-  PRIMARY KEY  (`char_id`,`friend_name`) 
+  PRIMARY KEY  (`charId`,`friend_name`) 
 );

datapack_development/sql/character_hennas.sql

@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS `character_hennas` (
-  `char_obj_id` INT NOT NULL DEFAULT 0,
+  `charId` INT UNSIGNED NOT NULL DEFAULT 0,
   `symbol_id` INT,
   `slot` INT NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`char_obj_id`,`slot`,`class_index`)
+  PRIMARY KEY (`charId`,`slot`,`class_index`)
 );
 

datapack_development/sql/character_macroses.sql

@@ -2,12 +2,12 @@
 -- Table structure for character_macroses
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS `character_macroses` (
-  `char_obj_id` INT NOT NULL DEFAULT 0,
+  `charId` INT UNSIGNED NOT NULL DEFAULT 0,
   `id` INT NOT NULL DEFAULT 0,
   `icon` INT,
   `name` VARCHAR(40) ,
   `descr` VARCHAR(80) ,
   `acronym` VARCHAR(4) ,
   `commands` VARCHAR(255) ,
-  PRIMARY KEY  (`char_obj_id`,`id`)
+  PRIMARY KEY  (`charId`,`id`)
 );

datapack_development/sql/character_quests.sql

@@ -2,10 +2,10 @@
 -- Table structure for character_quests
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `character_quests` (
-  `char_id` INT NOT NULL DEFAULT 0,
+  `charId` INT UNSIGNED NOT NULL DEFAULT 0,
   `name` VARCHAR(40) NOT NULL DEFAULT '',
   `var`  VARCHAR(20) NOT NULL DEFAULT '',
   `value` VARCHAR(255) ,
   `class_index` int(1) NOT NULL default '0',
-  PRIMARY KEY  (`char_id`,`name`,`var`,`class_index`)
+  PRIMARY KEY  (`charId`,`name`,`var`,`class_index`)
 );

datapack_development/sql/character_recipebook.sql

@@ -2,8 +2,8 @@
 -- Table structure for character_recipebook
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS character_recipebook (
-  char_id decimal(11) NOT NULL default 0,
+  charId INT UNSIGNED NOT NULL default 0,
   id decimal(11) NOT NULL default 0,
   type INT NOT NULL default 0,
-  PRIMARY KEY  (id,char_id)
+  PRIMARY KEY  (id,charId)
 );

datapack_development/sql/character_recommends.sql

@@ -2,7 +2,7 @@
 -- Table structure for character_recommends 
 -- ---------------------------- 
 CREATE TABLE IF NOT EXISTS character_recommends ( 
- char_id INT NOT NULL default 0, 
+ charId INT UNSIGNED NOT NULL default 0, 
  target_id INT(11) NOT NULL DEFAULT 0, 
- PRIMARY KEY (char_id,target_id) 
+ PRIMARY KEY (charId,target_id) 
 ); 

datapack_development/sql/character_shortcuts.sql

@@ -2,13 +2,13 @@
 -- Table structure for character_shortcuts
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS character_shortcuts (
-  char_obj_id decimal(11) NOT NULL default 0,
+  charId INT UNSIGNED NOT NULL default 0,
   slot decimal(3) NOT NULL default 0,
   page decimal(3) NOT NULL default 0,
   type decimal(3) ,
   shortcut_id decimal(16) ,
   level varchar(4) ,
   `class_index` int(1) NOT NULL default '0',
-  PRIMARY KEY  (char_obj_id,slot,page,`class_index`),
+  PRIMARY KEY  (charId,slot,page,`class_index`),
   KEY `shortcut_id` (`shortcut_id`)
 ) ;

datapack_development/sql/character_skills.sql

@@ -2,10 +2,10 @@
 -- Table structure for character_skills
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS character_skills (
-  char_obj_id INT NOT NULL default 0,
+  charId INT UNSIGNED NOT NULL default 0,
   skill_id INT NOT NULL default 0,
   skill_level varchar(5) ,
   skill_name varchar(40),
   `class_index` INT(1) NOT NULL DEFAULT 0,
-  PRIMARY KEY  (char_obj_id,skill_id,`class_index`)
+  PRIMARY KEY  (charId,skill_id,`class_index`)
 ) ;

datapack_development/sql/character_skills_save.sql

@@ -2,7 +2,7 @@
 -- Table structure for character_skills
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS character_skills_save (
-  char_obj_id INT NOT NULL default 0,
+  charId INT NOT NULL default 0,
   skill_id INT NOT NULL default 0,
   skill_level INT NOT NULL default 0,
   effect_count INT NOT NULL default 0,
@@ -11,5 +11,5 @@ CREATE TABLE IF NOT EXISTS character_skills_save (
   restore_type INT(1) NOT NULL DEFAULT 0,
   `class_index` INT(1) NOT NULL DEFAULT 0,
   buff_index INT(2) NOT NULL default 0,
-  PRIMARY KEY  (char_obj_id,skill_id,`class_index`)
+  PRIMARY KEY  (charId,skill_id,`class_index`)
 ) ;

datapack_development/sql/character_subclasses.sql

@@ -2,11 +2,11 @@
 -- Table structure for character_subclasses
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS `character_subclasses` (
-	`char_obj_id` decimal(11,0) NOT NULL default '0',
-	`class_id` int(2) NOT NULL default '0',
-	`exp` decimal(20,0) NOT NULL default '0',
-	`sp` decimal(11,0) NOT NULL default '0',
-	`level` int(2) NOT NULL default '40',
-	`class_index` int(1) NOT NULL default '0',
-	PRIMARY KEY  (`char_obj_id`,`class_id`)
+	`charId` INT UNSIGNED NOT NULL default 0,
+	`class_id` int(2) NOT NULL default 0,
+	`exp` decimal(20,0) NOT NULL default 0,
+	`sp` decimal(11,0) NOT NULL default 0,
+	`level` int(2) NOT NULL default 40,
+	`class_index` int(1) NOT NULL default 0,
+	PRIMARY KEY  (`charId`,`class_id`)
 ) ;

datapack_development/sql/characters.sql

@@ -3,7 +3,7 @@
 -- ---------------------------
 CREATE TABLE IF NOT EXISTS characters (
   account_name VARCHAR(45) DEFAULT NULL,
-  obj_Id INT UNSIGNED NOT NULL DEFAULT 0,
+  charId INT UNSIGNED NOT NULL DEFAULT 0,
   char_name VARCHAR(35) NOT NULL,
   level TINYINT UNSIGNED DEFAULT NULL,
   maxHp MEDIUMINT UNSIGNED DEFAULT NULL,
@@ -58,6 +58,6 @@ CREATE TABLE IF NOT EXISTS characters (
   clan_join_expiry_time BIGINT UNSIGNED NOT NULL DEFAULT 0,
   clan_create_expiry_time BIGINT UNSIGNED NOT NULL DEFAULT 0,
   death_penalty_level SMALLINT UNSIGNED NOT NULL DEFAULT 0,
-  PRIMARY KEY  (obj_Id),
+  PRIMARY KEY  (charId),
   KEY `clanid` (`clanid`)
 ) ;

datapack_development/sql/cursed_weapons.sql

@@ -3,7 +3,7 @@
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS `cursed_weapons` (
   `itemId` INT,
-  `playerId` INT DEFAULT 0,
+  `charId` INT UNSIGNED NOT NULL DEFAULT 0,
   `playerKarma` INT DEFAULT 0,
   `playerPkKills` INT DEFAULT 0,
   `nbKills` INT DEFAULT 0,

datapack_development/sql/heroes.sql

@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS `heroes` (
-  `char_id` decimal(11,0) NOT NULL default '0',
-  `char_name` varchar(45) NOT NULL default '',
-  `class_id` decimal(3,0) NOT NULL default '0',
-  `count` decimal(3,0) NOT NULL default '0',
-  `played` decimal(1,0) NOT NULL default '0',
-  PRIMARY KEY  (`char_id`)
+  `charId` INT UNSIGNED NOT NULL default 0,
+  `char_name` varchar(35) NOT NULL default '',
+  `class_id` decimal(3,0) NOT NULL default 0,
+  `count` decimal(3,0) NOT NULL default 0,
+  `played` decimal(1,0) NOT NULL default 0,
+  PRIMARY KEY  (`charId`)
 );

datapack_development/sql/olympiad_nobles.sql

@@ -1,8 +1,8 @@
 CREATE TABLE IF NOT EXISTS `olympiad_nobles` (
-  `char_id` decimal(11,0) NOT NULL default '0',
-  `class_id` decimal(3,0) NOT NULL default '0',
+  `charId` INT UNSIGNED NOT NULL default 0,
+  `class_id` decimal(3,0) NOT NULL default 0,
   `char_name` varchar(45) NOT NULL default '',
-  `olympiad_points` decimal(10,0) NOT NULL default '0',
-  `competitions_done` decimal(3,0) NOT NULL default '0',
-  PRIMARY KEY  (`char_id`)
+  `olympiad_points` decimal(10,0) NOT NULL default 0,
+  `competitions_done` decimal(3,0) NOT NULL default 0,
+  PRIMARY KEY  (`charId`)
 );

datapack_development/sql/seven_signs.sql

@@ -1,11 +1,11 @@
 CREATE TABLE IF NOT EXISTS `seven_signs` (
-  `char_obj_id` INT NOT NULL default '0',
+  `charId` INT UNSIGNED NOT NULL default 0,
   `cabal` VARCHAR(4) NOT NULL default '',
-  `seal` INT(1) NOT NULL default '0',
-  `red_stones` INT NOT NULL default '0',
-  `green_stones` INT NOT NULL default '0',
-  `blue_stones` INT NOT NULL default '0',
-  `ancient_adena_amount` DECIMAL(20,0) NOT NULL default '0',
-  `contribution_score` DECIMAL(20,0) NOT NULL default '0',
-  PRIMARY KEY  (`char_obj_id`)
+  `seal` INT(1) NOT NULL default 0,
+  `red_stones` INT NOT NULL default 0,
+  `green_stones` INT NOT NULL default 0,
+  `blue_stones` INT NOT NULL default 0,
+  `ancient_adena_amount` DECIMAL(20,0) NOT NULL default 0,
+  `contribution_score` DECIMAL(20,0) NOT NULL default 0,
+  PRIMARY KEY  (`charId`)
 );

datapack_development/sql/updates/20080505update.sql

@@ -0,0 +1,17 @@
+ALTER TABLE `characters` CHANGE `obj_Id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_quests` CHANGE `char_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_recommends` CHANGE `char_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_recipebook` CHANGE `char_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_hennas` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_macroses` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_shortcuts` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_subclasses` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_skills` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_skills_save` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `character_friends`
+CHANGE `char_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0, 
+CHANGE `friend_id` `friendId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `cursed_weapons` CHANGE `playerId` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `heroes` CHANGE `char_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `olympiad_nobles` CHANGE `char_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;
+ALTER TABLE `seven_signs` CHANGE `char_obj_id` `charId` INT UNSIGNED NOT NULL DEFAULT 0;