Moved sql_utility.*pp to server/ directory

Also padded setup_server.sql's formatting, for readability.
2014-09-28 03:36:00 +10:00
parent bfcf9a1d37
commit e452f2ecfc
7 changed files with 123 additions and 28 deletions
@@ -1,23 +1,26 @@
 CREATE TABLE IF NOT EXISTS Accounts (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	username varchar(100) UNIQUE,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
+	username	varchar(100) UNIQUE,
+
 	--TODO: server-client security
--	passhash varchar(100),
--	passsalt varchar(100),
-	blacklisted BIT DEFAULT 0,
-	whitelisted BIT DEFAULT 1,
-	mod BIT DEFAULT 0,
-	admin BIT DEFAULT 0
+--	passhash	varchar(100),
+--	passsalt	varchar(100),
+
+	--server controls
+	blacklisted	BIT DEFAULT 0,
+	whitelisted	BIT DEFAULT 1,
+	mod			BIT DEFAULT 0,
+	admin		BIT DEFAULT 0
 );

 CREATE TABLE IF NOT EXISTS Characters (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,

 	--metadata
-	owner INTEGER REFERENCES Accounts(uid),
-	handle varchar(100) UNIQUE,
-	avatar varchar(100),
-	birth timestamp NOT NULL DEFAULT (datetime()),
+	owner		INTEGER REFERENCES Accounts(uid),
+	handle		varchar(100) UNIQUE,
+	avatar		varchar(100),
+	birth		timestamp NOT NULL DEFAULT (datetime()),

 	--position in the world
 	roomIndex	INTEGER DEFAULT 0,
@@ -40,7 +43,7 @@ CREATE TABLE IF NOT EXISTS Characters (

 CREATE TABLE IF NOT EXISTS StatisticSets (
 	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
+	uid				INTEGER PRIMARY KEY AUTOINCREMENT,

 	--general use statistics
 	level			INTEGER DEFAULT 0,
@@ -59,26 +62,42 @@ CREATE TABLE IF NOT EXISTS StatisticSets (
 	luck			REAL DEFAULT 0.0
 );

-CREATE TABLE IF NOT EXISTS InventoryItems (
+CREATE TABLE IF NOT EXISTS InWorldItems (
 	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	owner INTEGER REFERENCES Characters(uid),
-	itemType INTEGER,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
+	itemType	INTEGER,
+
+	--position in the world
+	roomIndex	INTEGER DEFAULT 0,
+	originX		INTEGER DEFAULT 0,
+	originY		INTEGER DEFAULT 0,

 	--unique information
-	stackSize INTEGER DEFAULT 0,
-	durability INTEGER DEFAULT 0,
-	stats INTEGER REFERENCES StatisticSets(uid)
+	stackSize	INTEGER DEFAULT 0,
+	durability	INTEGER DEFAULT 0,
+	stats		INTEGER REFERENCES StatisticSets(uid)
+);
+
+CREATE TABLE IF NOT EXISTS InventoryItems (
+	--metadata
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
+	owner		INTEGER REFERENCES Characters(uid),
+	itemType	INTEGER,
+
+	--unique information
+	stackSize	INTEGER DEFAULT 0,
+	durability	INTEGER DEFAULT 0,
+	stats		INTEGER REFERENCES StatisticSets(uid)
 );

 CREATE TABLE IF NOT EXISTS WornEquipment (
 	--metadata
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
-	owner INTEGER REFERENCES Characters(uid),
-	itemType INTEGER,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
+	owner		INTEGER REFERENCES Characters(uid),
+	itemType	INTEGER,

 	--unique information
-	durability INTEGER DEFAULT 0,
-	stats INTEGER REFERENCES StatisticSets(uid)
+	durability	INTEGER DEFAULT 0,
+	stats		INTEGER REFERENCES StatisticSets(uid)
 	--TODO: attached script?
 );