Experimenting with SQL

rsc/scripts/setup_server.sql

@@ -30,14 +30,13 @@ PRAGMA foreign_keys = ON;
 --table definitions
 -------------------------
 
-
 CREATE TABLE IF NOT EXISTS UserAccounts (
 	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
 	username	varchar(100) UNIQUE, --TODO: (3) Swap username for email address
 
 	--server-client security
---	passhash	varchar(100),
---	passsalt	varchar(100),
+	passhash	varchar(100),
+	passsalt	varchar(100),
 
 	--server controls
 	blacklisted	BIT DEFAULT 0,
@@ -88,6 +87,20 @@ CREATE TABLE IF NOT EXISTS LiveCreatures (
 	originY		INTEGER DEFAULT 0
 );
 
+-------------------------
+--global tables
+-------------------------
+
+CREATE TABLE IF NOT EXISTS InventoryItems (
+	--metadata
+	uid		INTEGER PRIMARY KEY AUTOINCREMENT,
+	name	varchar(100) UNIQUE,
+	type	varchar(100), --tmp type
+
+	--unique information
+	durability	INTEGER DEFAULT 0
+);
+
 -------------------------
 --member tables
 -------------------------
@@ -113,16 +126,6 @@ CREATE TABLE IF NOT EXISTS CombatStatistics (
 	luck			REAL DEFAULT 0.0
 );
 
-CREATE TABLE IF NOT EXISTS InventoryItems (
-	--metadata
-	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	itemType	INTEGER,
-
-	--unique information
-	stackSize	INTEGER DEFAULT 0,
-	durability	INTEGER DEFAULT 0
-);
-
 -------------------------
 --cross reference tables
 -------------------------