diesel

.cargo/config

@@ -0,0 +1,3 @@
+[target.x86_64-pc-windows-msvc.gnu]
+rustc-link-search = ["C:\\Program Files\\PostgreSQL\\pg96\\lib"]
+

.env

@@ -0,0 +1 @@
+DATABASE_URL=postgres://cryps:craftbeer@localhost/cryps

Cargo.toml

@@ -11,3 +11,5 @@ serde_derive = "1"
 serde_cbor = "0.9"
 ws = "*"
 env_logger = "*"
+diesel = { version = "1.0.0", features = ["postgres", "uuid"] }
+dotenv = "0.9.0"

WORKLOG.md

@@ -1,10 +1,13 @@
 * Battling
-  * Cryp Serialisation
-    * RPC
   * Logins
     * Cryp Ownership
   * Matchmaking
+    * Lobbies
+      * Create
+      * Join
+      * Resolve
   * Stats
+  * Missions
 
 * Cryp Generation
   *

diesel.toml

@@ -0,0 +1,5 @@
+# For documentation on how to configure this file,
+# see diesel.rs/guides/configuring-diesel-cli
+
+[print_schema]
+file = "src/schema.rs"

migrations/00000000000000_diesel_initial_setup/down.sql

@@ -0,0 +1,6 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+DROP FUNCTION IF EXISTS diesel_manage_updated_at(_tbl regclass);
+DROP FUNCTION IF EXISTS diesel_set_updated_at();

migrations/00000000000000_diesel_initial_setup/up.sql

@@ -0,0 +1,36 @@
+-- This file was automatically created by Diesel to setup helper functions
+-- and other internal bookkeeping. This file is safe to edit, any future
+-- changes will be added to existing projects as new migrations.
+
+
+
+
+-- Sets up a trigger for the given table to automatically set a column called
+-- `updated_at` whenever the row is modified (unless `updated_at` was included
+-- in the modified columns)
+--
+-- # Example
+--
+-- ```sql
+-- CREATE TABLE users (id SERIAL PRIMARY KEY, updated_at TIMESTAMP NOT NULL DEFAULT NOW());
+--
+-- SELECT diesel_manage_updated_at('users');
+-- ```
+CREATE OR REPLACE FUNCTION diesel_manage_updated_at(_tbl regclass) RETURNS VOID AS $$
+BEGIN
+    EXECUTE format('CREATE TRIGGER set_updated_at BEFORE UPDATE ON %s
+                    FOR EACH ROW EXECUTE PROCEDURE diesel_set_updated_at()', _tbl);
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION diesel_set_updated_at() RETURNS trigger AS $$
+BEGIN
+    IF (
+        NEW IS DISTINCT FROM OLD AND
+        NEW.updated_at IS NOT DISTINCT FROM OLD.updated_at
+    ) THEN
+        NEW.updated_at := current_timestamp;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;

migrations/2018-09-11-113648_create_lobbies/down.sql

@@ -0,0 +1 @@
+DROP TABLE lobbies;

migrations/2018-09-11-113648_create_lobbies/up.sql

@@ -0,0 +1,6 @@
+CREATE TABLE lobbies (
+  id uuid PRIMARY KEY,
+  a uuid NOT NULL,
+  b uuid,
+  data bytea
+);

src/combat.rs

@@ -91,16 +91,22 @@ pub fn test_battle() {
 
 #[cfg(test)]
 mod tests {
-  use *;
+  use super::*;
 
   #[test]
   fn pve_test() {
-    // let player = Cryp::new()
+    let player = Cryp::new()
-    //   .named("ca phe sua da".to_string())
+      .named("ca phe sua da".to_string())
-    //   .level(2)
+      .level(2)
-    //   .create();
+      .create();
 
-    // levelling(player);
+    levelling(player);
+    return;
+  }
+
+  #[test]
+  fn battle_test() {
+    test_battle();
     return;
   }
 

src/db.rs

@@ -0,0 +1,13 @@
+use diesel::prelude::*;
+use diesel::pg::PgConnection;
+use dotenv::dotenv;
+use std::env;
+
+pub fn establish_connection() -> PgConnection {
+    dotenv().ok();
+
+    let database_url = env::var("DATABASE_URL")
+        .expect("DATABASE_URL must be set");
+    PgConnection::establish(&database_url)
+        .expect(&format!("Error connecting to {}", database_url))
+}

src/lib.rs

@@ -0,0 +1,6 @@
+extern crate uuid;
+#[macro_use]
+extern crate diesel;
+
+pub mod schema;
+pub mod models;

src/main.rs

@@ -3,6 +3,10 @@ extern crate uuid;
 extern crate ws;
 extern crate env_logger;
 
+#[macro_use]
+extern crate diesel;
+extern crate dotenv;
+
 extern crate serde;
 extern crate serde_cbor;
 #[macro_use]
@@ -14,6 +18,8 @@ mod net;
 mod combat;
 mod skill;
 mod rpc;
+mod schema;
+mod models;
 
 use net::{start};
 

src/models.rs

@@ -0,0 +1,9 @@
+use diesel::sql_types::{Uuid,Bytea};
+
+#[derive(Queryable)]
+pub struct Lobby {
+    pub id: Uuid,
+    pub a: Uuid,
+    pub b: Uuid,
+    pub data: Bytea,
+}

src/schema.rs

@@ -0,0 +1,8 @@
+table! {
+    lobbies (id) {
+        id -> Uuid,
+        a -> Uuid,
+        b -> Nullable<Uuid>,
+        data -> Nullable<Bytea>,
+    }
+}