# HG changeset patch
# User "Rex Tsai <chihchun@kalug.linux.org.tw>"
# Date 1225274026 -28800
# Node ID 8155f93283963ab70deeade977ef6c32f404aaac
# Parent  279a000eb3b0e81daf9304ae43fb5878aba4145b# Parent  839d8ad81cdefebc549c2872a7658330dda6f70a
merged.

diff -r 279a000eb3b0 -r 8155f9328396 ikariam.sql
--- a/ikariam.sql	Wed Oct 29 17:49:08 2008 +0800
+++ b/ikariam.sql	Wed Oct 29 17:53:46 2008 +0800
@@ -1,21 +1,3 @@
-CREATE TABLE "ally" ("id" INTEGER PRIMARY KEY  NOT NULL , "name" TEXT, "members" INTEGER, "url" TEXT, "time" DATETIME);
-CREATE TABLE cities (
- cityId INTEGER PRIMARY KEY UNIQUE,
- citylevel INTEGER,
- cityname TEXT,
- user INTEGER,
- owner TEXT,
- ally TEXT,
- island INTEGER, "status" CHAR, "time" INTEGER);
-CREATE TABLE "island" (
- id BIGINT PRIMARY KEY UNIQUE,
- x INTEGER,
- y INTEGER,
- name TEXT,
- tradegood INTEGER,
- wonder INTEGER,
- people INTEGER, "time" INTEGER);
-CREATE TABLE "user" ("id" INTEGER PRIMARY KEY ,"name" VARCHAR,"ally" VARCHAR,"allyId" INTEGER,"score" INTEGER,"building_score_main" INTEGER,"building_score_secondary" INTEGER,"research_score_main" INTEGER,"research_score_secondary" INTEGER,"army_score_main" INTEGER,"trader_score_secondary" INTEGER, "time" INTEGER);
 CREATE TABLE "ally" ("id" INTEGER PRIMARY KEY  NOT NULL , "name" TEXT, "members" INTEGER, "url" TEXT, "time" DATETIME);
 CREATE TABLE cities (
  cityId INTEGER PRIMARY KEY UNIQUE,