Changeset 12676585ba100d724ee89e914e7a954fce69068a

Timestamp:

03/17/07 13:57:53 (2 years ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1174136273 +0100

git-parent:

[15188108f117a3325007e48c9a7e54c7a7e9c7c1]

git-author:

Christopher Jung <bktheg@web.de> 1174136273 +0100

Message:

FK-Constraint fuer battles_ships.shipid eingebaut

Files:

• db/tables/battles_ships.sql (modified) (2 diffs)
• db/updates.xml (modified) (1 diff)
• src/net/driftingsouls/ds2/server/battles/Battle.java (modified) (1 diff)

db/tables/battles_ships.sql

@@ -1 +1 @@
-CREATE TABLE `battles_ships` (
-mediumint(8) unsigned
+int(11)
-  `battleid` smallint(5) unsigned NOT NULL default '0',
-  `side` tinyint(3) unsigned NOT NULL default '0',
@@ -15 +15 @@
-  KEY `battleid` (`battleid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Die Schiffsdaten in Schlachten'; 
+
+ALTER TABLE battles_ships ADD CONSTRAINT battles_ships_fk_ships FOREIGN KEY (shipid) REFERENCES ships(id);

db/updates.xml

@@ -163 +163 @@
-                ALTER TABLE battles CHANGE id id SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT;
-                ALTER TABLE battles_ships ADD CONSTRAINT battles_ships_fk_battles FOREIGN KEY (battleid) REFERENCES battles(id);
+                ALTER TABLE battles_ships CHANGE shipid shipid INT NOT NULL DEFAULT '0';
+                ALTER TABLE battles_ships ADD CONSTRAINT battles_ships_fk_ships FOREIGN KEY (shipid) REFERENCES ships(id);
-        ]]></update>
-</updates>

src/net/driftingsouls/ds2/server/battles/Battle.java

@@ -1874 +1874 @@
-                                dockcount--;
-                                
+                                db.update("DELETE FROM battles_ships WHERE shipid=",aship.getInt("id"));
+                                
-                                Ships.destroy( aship.getInt("id") );
-                                db.update("DELETE FROM battles_ships WHERE shipid=",aship.getInt("id"));
-                        }
-