Merge pull request #193 from AdExNetwork/issue-151-migrations

Issue #151 migrations

Author: elpiel

.gitignore

@@ -3,4 +3,5 @@ target
 .env
 *.iml
 .idea
-.old
+.old
+Migrant.toml

Cargo.lock

@@ -222,7 +222,7 @@ pub mod postgres {
     impl From<&Row> for Channel {
         fn from(row: &Row) -> Self {
             Self {
-                id: row.get("channel_id"),
+                id: row.get("id"),
                 creator: row.get("creator"),
                 deposit_asset: row.get("deposit_asset"),
                 deposit_amount: row.get("deposit_amount"),

primitives/src/channel.rs

@@ -8,24 +8,26 @@ edition = "2018"
 # Futures
 futures-preview = { version = "=0.3.0-alpha.19", features = ["compat"]}
 # Primitives
-primitives = {path = "../primitives", features = ["postgres"]}
+primitives = { path = "../primitives", features = ["postgres"] }
 adapter = { version = "0.1", path = "../adapter" }
 chrono = { version = "0.4", features = ["serde"] }
 hex = "0.3.2"
 # CLI
 clap = "2.33.0"
 # Server
 tokio = "0.2.0-alpha.6"
-hyper = {version = "=0.13.0-alpha.4", features = ["unstable-stream"]}
+hyper = { version = "=0.13.0-alpha.4", features = ["unstable-stream"] }
 regex = "1"
 # Database
-redis = {version = "0.13.1-alpha.0", features = ["tokio-executor"]}
-bb8 = {git = "https://github.com/djc/bb8", branch = "async-await"}
-bb8-postgres = {git = "https://github.com/djc/bb8", branch = "async-await", features = ["with-chrono-0_4", "with-serde_json-1"]}
+redis = { version = "0.13.1-alpha.0", features = ["tokio-executor"] }
+bb8 = { git = "https://github.com/djc/bb8", branch = "async-await" }
+bb8-postgres = { git = "https://github.com/djc/bb8", branch = "async-await", features = ["with-chrono-0_4", "with-serde_json-1"] }
+# Migrations
+migrant_lib = { version = "0.27", features = ["d-postgres"] }
 # Logger
 slog = { version = "^2.2.3" , features = ["max_level_trace"] }
 # Serde
-serde = {version = "^1.0", features = ['derive']}
+serde = { version = "^1.0", features = ['derive'] }
 serde_json = "^1.0"
 serde_urlencoded = "0.6.1"
 # Other

sentry/Cargo.toml

@@ -0,0 +1,15 @@
+# Required, do not edit
+database_type = "postgres"
+
+# Required database info
+database_name = "postgres"
+database_user = "postgres"
+database_password = "docker"
+
+# Configurable database info
+# default "localhost"
+database_host = "localhost"
+# default "5432"
+database_port = "5432"
+# default "migrations"
+migration_location = "migrations"

sentry/Migrant.dist.toml

@@ -0,0 +1,19 @@
+# Sentry
+
+## Development
+
+### Migrations
+While you can create the migration files yourself, you can also use `migrant`
+to create them for you.
+
+#### Migrant
+1) In order to use `migrant` you need to first install it:
+
+    * via cargo: `cargo install migrant --features postgres`
+    
+    (for more options see the [migrant homepage](https://github.com/jaemk/migrant))
+
+2) And setup the `Migrant.toml` file, a reference to which you can find
+in [Migrant.dist.toml](Migrant.dist.toml).
+
+For more information see [migrant homepage](https://github.com/jaemk/migrant).