From 0965d62be00a7820f97284704dc71f37e661b412 Mon Sep 17 00:00:00 2001 From: Kevin J Hoerr Date: Sun, 26 Aug 2018 01:38:28 -0400 Subject: Begin migration to Rust; Add actix-web, diesel as main dependencies --- private/Model/Connection.php | 42 ------------------ private/Model/Query.php | 71 ----------------------------- private/Model/Result.php | 52 ---------------------- private/Model/creds.php | 10 ----- private/Model/fresh.sql | 103 ------------------------------------------- 5 files changed, 278 deletions(-) delete mode 100644 private/Model/Connection.php delete mode 100644 private/Model/Query.php delete mode 100644 private/Model/Result.php delete mode 100644 private/Model/creds.php delete mode 100644 private/Model/fresh.sql (limited to 'private/Model') diff --git a/private/Model/Connection.php b/private/Model/Connection.php deleted file mode 100644 index 4afa330..0000000 --- a/private/Model/Connection.php +++ /dev/null @@ -1,42 +0,0 @@ -host . - (($cred->port !== '') ? ";port=" . $cred->port : '') . - ";dbname=" . $cred->dbName, - $cred->login, - $cred->password - ); - // we destroy $cred as quickly as possible - $cred = null; - } catch (\PDOException $err) { - // we destroy $cred as quickly as possible - $cred = null; - throw $err; // throw for Controller to catch - } - return $this; - } -} diff --git a/private/Model/Query.php b/private/Model/Query.php deleted file mode 100644 index 7eca836..0000000 --- a/private/Model/Query.php +++ /dev/null @@ -1,71 +0,0 @@ -path = $path; - $this->request = $request; - $this->content = $content; - - return $this; - } - - /** - * Returns the request path made by the client. - * - * @return array - */ - public function getPath (): array - { - return $this->path; - } - - /** - * Returns the request type made by the client. - * - * @return string - */ - public function getRequest (): string - { - return $this->request; - } - - /** - * Returns the information that is built from outside the request path. - * - * @return array - */ - public function getContent (): array - { - return $this->content; - } -} diff --git a/private/Model/Result.php b/private/Model/Result.php deleted file mode 100644 index ac08821..0000000 --- a/private/Model/Result.php +++ /dev/null @@ -1,52 +0,0 @@ -resultType = $resultType; - $this->result = $result; - - return $this; - } - - /** - * Returns the result type of the Result. - * - * @return string - */ - public function getResultType (): string - { - return $this->resultType; - } - - /** - * Returns the result array of the Result. - * - * @return array - */ - public function getResult (): array - { - return $this->result; - } -} \ No newline at end of file diff --git a/private/Model/creds.php b/private/Model/creds.php deleted file mode 100644 index 056d77b..0000000 --- a/private/Model/creds.php +++ /dev/null @@ -1,10 +0,0 @@ -host = "localhost"; -$cred->port = "5432"; -$cred->dbName = ""; -$cred->login = ""; -$cred->password = ""; diff --git a/private/Model/fresh.sql b/private/Model/fresh.sql deleted file mode 100644 index f39b360..0000000 --- a/private/Model/fresh.sql +++ /dev/null @@ -1,103 +0,0 @@ - -- fresh.sql: SQL script that creates the tables used by AO - -- please drop all tables in db before initiating unless told otherwise - - -- uncomment the following two lines to automatically drop all tables ---DROP SCHEMA "public" CASCADE; ---CREATE SCHEMA "public"; - -CREATE OR REPLACE FUNCTION public.GETDATE() RETURNS TIMESTAMPTZ - STABLE LANGUAGE SQL AS 'SELECT NOW()'; - - -- base table for users -CREATE TABLE users ( - userid SERIAL, - email VARCHAR(40) UNIQUE NOT NULL, - firstname VARCHAR(20) NOT NULL, - lastname VARCHAR(20) NOT NULL, - password VARCHAR(255) NOT NULL, -- intend to use bcrypt hash through PHP - games INTEGER DEFAULT 0, -- simple tracking statistics - wins INTEGER DEFAULT 0, -- " - joindate DATE DEFAULT GETDATE(), - activated BIT(1) DEFAULT B'0', -- see activation_keys table - PRIMARY KEY (userid) -); - - -- when activation is completed, key gets deleted and activated bit for user gets flipped to 1. -CREATE TABLE activation_keys ( - code VARCHAR(128), - userid SERIAL, - PRIMARY KEY (code), - CONSTRAINT activation_keys_userid - FOREIGN KEY (userid) REFERENCES users(userid) -); - - -- base table for games -CREATE TABLE games ( - gameid SERIAL, - title VARCHAR(140) NOT NULL, - gametypeid SERIAL NOT NULL, -- future proofing: suppose different game types - players SMALLINT NOT NULL, -- number of players in a game - waitfor INTEGER NOT NULL, -- time in seconds to wait for player to complete a turn - lastturn DATE DEFAULT GETDATE(), - gamestate INTEGER DEFAULT 1, - PRIMARY KEY (gameid) -); - - -- associative table: many users, many games -CREATE TABLE allegiances ( - gameid SERIAL, - userid SERIAL, - allegiance VARCHAR(140), -- important/unimportant role for user (depends on gametype) - ordernum SMALLINT NOT NULL, -- user # spot in game - playing SMALLINT DEFAULT 1, -- default is binary: 0 means player OOP - PRIMARY KEY (gameid, userid), - CONSTRAINT users_games_gameid - FOREIGN KEY (gameid) REFERENCES games(gameid), - CONSTRAINT users_games_userid - FOREIGN KEY (userid) REFERENCES users(userid) -); - - -- Regions are composed of nationstates -CREATE TABLE regions ( - regionid SERIAL, - name VARCHAR(64) NOT NULL, - abbreviation CHAR(2), - bonus INTEGER NOT NULL, - PRIMARY KEY (regionid) -); - - -- base table for nationstates -CREATE TABLE nationstates ( - nationid SERIAL, - regionid SERIAL, - name VARCHAR(64) NOT NULL, - abbreviation CHAR(4), - PRIMARY KEY (nationid), - CONSTRAINT nationstates_regionid - FOREIGN KEY (regionid) REFERENCES regions(regionid) -); - - -- nationstates border nationstates -CREATE TABLE borders ( - nationid SERIAL, - borderid SERIAL, - PRIMARY KEY (nationid, borderid), - CONSTRAINT borders_nationid - FOREIGN KEY (nationid) REFERENCES nationstates(nationid), - CONSTRAINT borders_borderid - FOREIGN KEY (borderid) REFERENCES nationstates(nationid) -); - - -- associative table: many games, many nationstates. Users control them. -CREATE TABLE games_nationstates ( - gameid SERIAL, - nationid SERIAL, - userid SERIAL, -- owner of nationstate for particular game - PRIMARY KEY (gameid, nationid), - CONSTRAINT games_nationstates_gameid - FOREIGN KEY (gameid) REFERENCES games(gameid), - CONSTRAINT games_nationstates_nationid - FOREIGN KEY (nationid) REFERENCES nationstates(nationid), - CONSTRAINT games_nationstates_userid - FOREIGN KEY (userid) REFERENCES users(userid) -); -- cgit