Simplify db migrations

Use `refinery_cli` against a folder of `.sql` migrations.

I got tired of commenting out my code when I just wanted to rerun the initial migration.

Plain SQL is a lot more flexible than the `barrel` syntax.

Cargo.lock

@@ -54,12 +54,6 @@ version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
 
-[[package]]
-name = "arc-swap"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
-
 [[package]]
 name = "async-compression"
 version = "0.3.5"
@@ -118,17 +112,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "autocfg"
 version = "0.1.7"
@@ -141,12 +124,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 
-[[package]]
-name = "barrel"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d67c978b1322c8031145b1f6c236fc371292f52c565bc96018b2971afcbffe1"
-
 [[package]]
 name = "base64"
 version = "0.12.3"
@@ -159,9 +136,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "barrel",
  "chrono",
- "clap",
  "dotenv",
  "http",
  "http-api-problem",
@@ -169,7 +144,6 @@ dependencies = [
  "ipnetwork",
  "listenfd",
  "lru",
- "refinery",
  "serde",
  "serde_json",
  "sqlx",
@@ -291,38 +265,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "clap"
-version = "3.0.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "860643c53f980f0d38a5e25dfab6c3c93b2cb3aa1fe192643d17a293c6c41936"
-dependencies = [
- "atty",
- "bitflags",
- "clap_derive",
- "indexmap",
- "lazy_static",
- "os_str_bytes",
- "strsim",
- "termcolor",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap_derive"
-version = "3.0.0-beta.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb51c9e75b94452505acd21d929323f5a5c6c4735a852adbd39ef5fb1b014f30"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -332,15 +274,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "const-random"
 version = "0.1.8"
@@ -421,17 +354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
 dependencies = [
  "generic-array 0.12.3",
- "subtle 1.0.0",
+ "subtle",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
-dependencies = [
- "generic-array 0.14.3",
- "subtle 2.2.3",
 ]
 
 [[package]]
@@ -470,12 +393,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
-[[package]]
-name = "fallible-iterator"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
-
 [[package]]
 name = "flate2"
 version = "1.0.16"
@@ -579,18 +496,6 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789"
 
-[[package]]
-name = "futures-macro"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "futures-sink"
 version = "0.3.5"
@@ -615,14 +520,11 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-io",
- "futures-macro",
  "futures-sink",
  "futures-task",
  "memchr",
  "pin-project",
  "pin-utils",
- "proc-macro-hack",
- "proc-macro-nested",
  "slab",
 ]
 
@@ -749,20 +651,10 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
 dependencies = [
- "crypto-mac 0.7.0",
+ "crypto-mac",
  "digest 0.8.1",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840"
-dependencies = [
- "crypto-mac 0.8.0",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "http"
 version = "0.2.1"
@@ -856,12 +748,6 @@ dependencies = [
  "bytes",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
-
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -919,15 +805,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "lock_api"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
-dependencies = [
- "scopeguard",
-]
-
 [[package]]
 name = "log"
 version = "0.4.11"
@@ -984,12 +861,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "md5"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
-
 [[package]]
 name = "memchr"
 version = "2.3.3"
@@ -1034,24 +905,12 @@ dependencies = [
  "kernel32-sys",
  "libc",
  "log",
- "miow 0.2.1",
+ "miow",
  "net2",
  "slab",
  "winapi 0.2.8",
 ]
 
-[[package]]
-name = "mio-named-pipes"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
-dependencies = [
- "log",
- "mio",
- "miow 0.3.5",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "mio-uds"
 version = "0.6.8"
@@ -1075,16 +934,6 @@ dependencies = [
  "ws2_32-sys",
 ]
 
-[[package]]
-name = "miow"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e"
-dependencies = [
- "socket2",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "multipart"
 version = "0.17.0"
@@ -1212,62 +1061,12 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06de47b848347d8c4c94219ad8ecd35eb90231704b067e67e6ae2e36ee023510"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
-dependencies = [
- "cfg-if",
- "cloudabi 0.1.0",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project"
 version = "0.4.23"
@@ -1306,79 +1105,18 @@ version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33"
 
-[[package]]
-name = "postgres-protocol"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81c5b25980f9a9b5ad36e9cdc855530575396d8a57f67e14691a2440ed0d9a90"
-dependencies = [
- "base64",
- "byteorder",
- "bytes",
- "fallible-iterator",
- "hmac 0.8.1",
- "md5",
- "memchr",
- "rand 0.7.3",
- "sha2 0.9.1",
- "stringprep",
-]
-
-[[package]]
-name = "postgres-types"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d14b0a4f433b0e0b565bb0fbc0ac9fc3d79ca338ba265ad0e7eef0f3bcc5e94"
-dependencies = [
- "bytes",
- "fallible-iterator",
- "postgres-protocol",
-]
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
 
-[[package]]
-name = "proc-macro-error"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "syn-mid",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro-hack"
 version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
 
-[[package]]
-name = "proc-macro-nested"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.19"
@@ -1523,7 +1261,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 dependencies = [
- "cloudabi 0.0.3",
+ "cloudabi",
  "fuchsia-cprng",
  "libc",
  "rand_core 0.4.2",
@@ -1565,50 +1303,6 @@ version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
-[[package]]
-name = "refinery"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "432021bd2eb60a8851757fdd145907be1a96c70961da167a3fb362001f2f397c"
-dependencies = [
- "refinery-core",
- "refinery-macros",
-]
-
-[[package]]
-name = "refinery-core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9f670a4f4d6450ce53ecf0dd55324e0a3b684c24693e5cd68fdeca2294b875a"
-dependencies = [
- "async-trait",
- "cfg-if",
- "chrono",
- "lazy_static",
- "log",
- "regex",
- "serde",
- "siphasher",
- "thiserror",
- "tokio",
- "tokio-postgres",
- "toml",
- "walkdir",
-]
-
-[[package]]
-name = "refinery-macros"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f397c4dfbcf0b298e8b10e5702d69852829636ee121215c42efe421dd16126e1"
-dependencies = [
- "proc-macro2",
- "quote",
- "refinery-core",
- "regex",
- "syn",
-]
-
 [[package]]
 name = "regex"
 version = "1.3.9"
@@ -1658,15 +1352,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "schannel"
 version = "0.1.19"
@@ -1683,12 +1368,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
 
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
 [[package]]
 name = "security-framework"
 version = "0.4.4"
@@ -1792,19 +1471,6 @@ dependencies = [
  "opaque-debug 0.2.3",
 ]
 
-[[package]]
-name = "sha2"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpuid-bool",
- "digest 0.9.0",
- "opaque-debug 0.3.0",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.0.9"
@@ -1814,22 +1480,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41"
-dependencies = [
- "arc-swap",
- "libc",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7"
-
 [[package]]
 name = "slab"
 version = "0.4.2"
@@ -1893,7 +1543,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "hex",
- "hmac 0.7.1",
+ "hmac",
  "ipnetwork",
  "libc",
  "log",
@@ -1904,7 +1554,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha-1 0.8.2",
- "sha2 0.8.2",
+ "sha2",
  "sqlformat",
  "tokio",
  "url",
@@ -1930,34 +1580,12 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "stringprep"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "subtle"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
-[[package]]
-name = "subtle"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
-
 [[package]]
 name = "syn"
 version = "1.0.36"
@@ -1969,17 +1597,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "syn-mid"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tempfile"
 version = "3.1.0"
@@ -1994,24 +1611,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.20"
@@ -2071,14 +1670,11 @@ dependencies = [
  "libc",
  "memchr",
  "mio",
- "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite",
- "signal-hook-registry",
  "slab",
  "tokio-macros",
- "winapi 0.3.9",
 ]
 
 [[package]]
@@ -2092,28 +1688,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "tokio-postgres"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a2482c9fe4dd481723cf5c0616f34afc710e55dcda0944e12e7b3316117892"
-dependencies = [
- "async-trait",
- "byteorder",
- "bytes",
- "fallible-iterator",
- "futures",
- "log",
- "parking_lot",
- "percent-encoding",
- "phf",
- "pin-project-lite",
- "postgres-protocol",
- "postgres-types",
- "tokio",
- "tokio-util",
-]
-
 [[package]]
 name = "tokio-tungstenite"
 version = "0.11.0"
@@ -2141,15 +1715,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "tower-service"
 version = "0.3.0"
@@ -2312,12 +1877,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
 
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.1"
@@ -2372,29 +1931,12 @@ version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "version_check"
 version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
 
-[[package]]
-name = "walkdir"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
 [[package]]
 name = "want"
 version = "0.3.0"
@@ -2468,15 +2010,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"

Cargo.toml

@@ -16,9 +16,6 @@ listenfd = "0.3"
 tokio = { version = "0.2", features = ["macros", "rt-threaded", "sync"] }
 sqlx = { version = "0.3", default-features = false, features = [ "runtime-tokio", "macros", "postgres", "chrono", "uuid", "ipnetwork", "json" ] }
 warp = { version = "0.2", features = ["compression"] }
-refinery = { version = "0.3.0", features = [ "tokio-postgres", "tokio" ] }
-barrel = { version = "0.6.5", features = [ "pg" ] }
-clap = "3.0.0-beta.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 uuid = { version = "0.8", features = ["serde", "v4"] }

README.md

@@ -1,20 +1,21 @@
 # BazaarRealmAPI
+
 The API for the Bazaar Realm Skyrim mod which is responsible for storing and
 serving data related to the mod to all users.
 
 Right now, the types of data the API stores and the endpoints to access them
 are (all prefixed under `/v1`, the API version):
 
-* `/owners`: Every player character that has registered with this API server.
+- `/owners`: Every player character that has registered with this API server.
-   Contains their unique api key. Owners own shops.
+  Contains their unique api key. Owners own shops.
-* `/shops`: Metadata about each shop including name, description, and who owns
+- `/shops`: Metadata about each shop including name, description, and who owns
-   it.
+  it.
-* `/interior_ref_lists`: Lists of in-game ObjectReferences that are in the
+- `/interior_ref_lists`: Lists of in-game ObjectReferences that are in the
-   interior of individual shops. When a user visits a shop, these references
+  interior of individual shops. When a user visits a shop, these references
-   are loaded into the cell.
+  are loaded into the cell.
-* `/merchandise_lists`: Lists of in-game Forms that are in the merchant chest
+- `/merchandise_lists`: Lists of in-game Forms that are in the merchant chest
-   of individual shops. When a user visits a shop, these forms are loaded
+  of individual shops. When a user visits a shop, these forms are loaded
-   onto the shop's shelves and are purchasable.
+  onto the shop's shelves and are purchasable.
 
 Bazaar Realm was designed to allow users to change the API they are using the
 mod under, if they wish. The API can run on a small server with minimal
@@ -27,19 +28,20 @@ database](https://www.postgresql.org).
 
 Related projects:
 
-* [`BazaarRealmClient`](https://github.com/thallada/BazaarRealmClient): DLL that
+- [`BazaarRealmClient`](https://github.com/thallada/BazaarRealmClient): DLL that
   handles requests and responses to this API
-* [`BazaarRealmPlugin`](https://github.com/thallada/BazaarRealmPlugin):
+- [`BazaarRealmPlugin`](https://github.com/thallada/BazaarRealmPlugin):
   [SKSE](https://skse.silverlock.org/) plugin for the mod that modifies data
   within the Skyrim game engine
-* [`BazaarRealmMod`](https://github.com/thallada/BazaarRealmMod): Papyrus
+- [`BazaarRealmMod`](https://github.com/thallada/BazaarRealmMod): Papyrus
   scripts, ESP plugin, and all other resources for the mod
 
 ## Development Setup
 
 1. Install and run postgres.
-2. Create postgres user and database (and add uuid extension while you're there 
+2. Create postgres user and database (and add uuid extension while you're there
    ):
+
 ```
 createuser bazaarrealm
 createdb bazaarrealm
@@ -57,14 +59,18 @@ postgres=# ALTER DATABASE bazaarrealm OWNER TO bazaarrealm;
 \password bazaarrealm
 postgres=# CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 ```
-3. Save password somewhere safe and then and add a `.env` file to the project 
+
+3. Save password somewhere safe and then and add a `.env` file to the project
    directory with the contents:
+
 ```
 DATABASE_URL=postgresql://bazaarrealm:<password>@localhost/bazaarrealm
 RUST_LOG="bazaar_realm_api=debug"
 HOST="http://localhost:3030"
 ```
+
 4. Create a new file at `src/db/refinery.toml` with the contents:
+
 ```
 [main]
 db_type = "Postgres"
@@ -74,9 +80,10 @@ db_user = "bazaarrealm"
 db_pass = "<database-password-here>"
 db_name = "bazaarrealm"
 ```
-5. Run `cargo run -- -m` which will compile the app in debug mode and run the 
+
-   database migrations.
+5. Install `refinery_cli` with `cargo install refinery_cli` and run `refinery migrate -c ./src/db/refinery.toml files -p ./src/db/migrations/` which will
-6. Run `./devserver.sh` to run the dev server (by default it listens at 
+   run the database migrations.
+6. Run `./devserver.sh` to run the dev server (by default it listens at
    `127.0.0.1:3030`).
 
 ## Testing Data
@@ -115,8 +122,8 @@ files that contain it, their data should be secure.
 
 ## Todo
 
-* Add update endpoints.
+- Add update endpoints.
-* Add endpoints for the other models.
+- Add endpoints for the other models.
-* Make self-contained docker container that can run the app without any setup.
+- Make self-contained docker container that can run the app without any setup.
-* Add rate-limiting per IP address. The `tower` crate has a service that might 
+- Add rate-limiting per IP address. The `tower` crate has a service that might
-  be useful for this.
+  be useful for this.

src/db/migrations/V1__initial.rs

@@ -1,76 +0,0 @@
-use barrel::{backend::Pg, types, Migration};
-
-pub fn migration() -> String {
-    let mut m = Migration::new();
-
-    m.create_table("owners", |t| {
-        t.add_column("id", types::primary().indexed(true));
-        t.add_column("name", types::varchar(255));
-        t.add_column("api_key", types::uuid().indexed(true));
-        t.add_column("ip_address", types::custom("inet").nullable(true));
-        t.add_column("mod_version", types::integer());
-        t.add_column("created_at", types::custom("timestamp(3)"));
-        t.add_column("updated_at", types::custom("timestamp(3)"));
-        t.add_index(
-            "owners_unique_name_and_api_key",
-            types::index(vec!["name", "api_key"]).unique(true),
-        );
-    });
-
-    m.create_table("shops", |t| {
-        t.add_column("id", types::primary().indexed(true));
-        t.add_column("name", types::varchar(255));
-        t.add_column("owner_id", types::foreign("owners", "id").indexed(true));
-        t.add_column("description", types::text().nullable(true));
-        // removing these until I figure out the plan for buying and selling
-        // t.add_column("is_not_sell_buy", types::boolean().default(true));
-        // t.add_column("sell_buy_list_id", types::integer().default(0));
-        // t.add_column("vendor_id", types::integer());
-        // t.add_column("vendor_gold", types::integer());
-        t.add_column("created_at", types::custom("timestamp(3)"));
-        t.add_column("updated_at", types::custom("timestamp(3)"));
-        t.add_index(
-            "shops_unique_name_and_owner_id",
-            types::index(vec!["name", "owner_id"]).unique(true),
-        );
-    });
-
-    m.create_table("merchandise_lists", |t| {
-        t.add_column("id", types::primary().indexed(true));
-        t.add_column(
-            "shop_id",
-            types::foreign("shops", "id").indexed(true).unique(true),
-        );
-        t.add_column("owner_id", types::foreign("owners", "id").indexed(true));
-        t.add_column("form_list", types::custom("jsonb"));
-        t.add_column("created_at", types::custom("timestamp(3)"));
-        t.add_column("updated_at", types::custom("timestamp(3)"));
-    });
-
-    // m.create_table("transactions", |t| {
-    // t.add_column("id", types::primary().indexed(true));
-    // t.add_column("shop_id", types::foreign("shops", "id").indexed(true));
-    // t.add_column("owner_id", types::foreign("owners", "id").indexed(true));
-    // t.add_column("merchandise_list_id", types::foreign("merchandise_lists", "id"));
-    // t.add_column("customer_name", types::varchar(255));
-    // t.add_column("is_customer_npc", types::boolean());
-    // t.add_column("is_customer_buying", types::boolean());
-    // t.add_column("quantity", types::integer());
-    // t.add_column("is_void", types::boolean());
-    // t.add_column("created_at", types::custom("timestamp(3)"));
-    // });
-
-    m.create_table("interior_ref_lists", |t| {
-        t.add_column("id", types::primary().indexed(true));
-        t.add_column(
-            "shop_id",
-            types::foreign("shops", "id").indexed(true).unique(true),
-        );
-        t.add_column("owner_id", types::foreign("owners", "id").indexed(true));
-        t.add_column("ref_list", types::custom("jsonb"));
-        t.add_column("created_at", types::custom("timestamp(3)"));
-        t.add_column("updated_at", types::custom("timestamp(3)"));
-    });
-
-    m.make::<Pg>()
-}

src/db/migrations/V1__initial.sql

@@ -0,0 +1,35 @@
+CREATE TABLE IF NOT EXISTS "owners" (
+    "id" SERIAL PRIMARY KEY NOT NULL,
+    "name" VARCHAR(255) NOT NULL,
+    "api_key" UUID NOT NULL UNIQUE,
+    "ip_address" inet,
+    "mod_version" INTEGER NOT NULL,
+    "created_at" timestamp(3) NOT NULL,
+    "updated_at" timestamp(3) NOT NULL
+);
+CREATE UNIQUE INDEX "owners_unique_name_and_api_key" ON "owners" ("name", "api_key");
+CREATE TABLE "shops" (
+    "id" SERIAL PRIMARY KEY NOT NULL,
+    "name" VARCHAR(255) NOT NULL,
+    "owner_id" INTEGER REFERENCES "owners"(id) NOT NULL,
+    "description" TEXT,
+    "created_at" timestamp(3) NOT NULL,
+    "updated_at" timestamp(3) NOT NULL
+);
+CREATE UNIQUE INDEX "shops_unique_name_and_owner_id" ON "shops" ("name", "owner_id");
+CREATE TABLE "interior_ref_lists" (
+    "id" SERIAL PRIMARY KEY NOT NULL,
+    "shop_id" INTEGER REFERENCES "shops"(id) NOT NULL UNIQUE,
+    "owner_id" INTEGER REFERENCES "owners"(id) NOT NULL,
+    "ref_list" jsonb NOT NULL,
+    "created_at" timestamp(3) NOT NULL,
+    "updated_at" timestamp(3) NOT NULL
+);
+CREATE TABLE "merchandise_lists" (
+    "id" SERIAL PRIMARY KEY NOT NULL,
+    "shop_id" INTEGER REFERENCES "shops"(id) NOT NULL UNIQUE,
+    "owner_id" INTEGER REFERENCES "owners"(id) NOT NULL,
+    "form_list" jsonb NOT NULL,
+    "created_at" timestamp(3) NOT NULL,
+    "updated_at" timestamp(3) NOT NULL
+);

src/db/migrations/mod.rs

@@ -1,3 +0,0 @@
-use refinery::include_migration_mods;
-
-include_migration_mods!("src/db/migrations");

src/db/mod.rs

@@ -1,16 +0,0 @@
-use refinery::config::Config;
-
-mod migrations;
-
-pub async fn migrate() {
-    let mut config = Config::from_file_location("src/db/refinery.toml").unwrap();
-
-    match migrations::runner().run_async(&mut config).await {
-        Ok(report) => {
-            dbg!(report.applied_migrations());
-        }
-        Err(error) => {
-            dbg!(error);
-        }
-    };
-}

src/db/reset_db.pgsql

@@ -0,0 +1,5 @@
+DROP TABLE owners CASCADE;
+DROP TABLE shops CASCADE;
+DROP TABLE interior_ref_lists CASCADE;
+DROP TABLE merchandise_lists CASCADE;
+DROP TABLE refinery_schema_history CASCADE;

src/main.rs

@@ -1,5 +1,4 @@
 use anyhow::Result;
-use clap::Clap;
 use dotenv::dotenv;
 use http::StatusCode;
 use hyper::server::Server;
@@ -14,7 +13,6 @@ use url::Url;
 use warp::Filter;
 
 mod caches;
-mod db;
 mod handlers;
 #[macro_use]
 mod macros;
@@ -28,13 +26,6 @@ use models::owner::Owner;
 use models::shop::Shop;
 use models::ListParams;
 
-#[derive(Clap)]
-#[clap(version = "0.1.0", author = "Tyler Hallada <tyler@hallada.net>")]
-struct Opts {
-    #[clap(short, long)]
-    migrate: bool,
-}
-
 #[derive(Debug, Clone)]
 pub struct Environment {
     pub db: PgPool,
@@ -69,7 +60,7 @@ fn json_body<T>() -> impl Filter<Extract = (T,), Error = warp::Rejection> + Clon
 where
     T: Send + DeserializeOwned,
 {
-    warp::body::content_length_limit(1024 * 64).and(warp::body::json())
+    warp::body::content_length_limit(1024 * 1024).and(warp::body::json())
 }
 
 #[tokio::main]
@@ -81,13 +72,6 @@ async fn main() -> Result<()> {
         .with_env_filter(env_log_filter)
         .with_span_events(FmtSpan::CLOSE)
         .init();
-    let opts: Opts = Opts::parse();
-
-    if opts.migrate {
-        info!("going to migrate now!");
-        db::migrate().await;
-        return Ok(());
-    }
 
     let host = env::var("HOST").expect("`HOST` environment variable not defined");
     let host_url = Url::parse(&host).expect("Cannot parse URL from `HOST` environment variable");