Updated diesel dependency

Cargo.toml

@@ -9,18 +9,17 @@ ui = []
 [dependencies]
 ape = "0.2.0"
 app_dirs = "1.1.1"
-diesel = { version = "0.99.0", features = ["sqlite"] }
-diesel_infer_schema = { version = "0.99.0", features = ["sqlite"] }
-diesel_migrations = { version = "0.99.0", features = ["sqlite"] }
+diesel = { version = "1.3.3", features = ["sqlite"] }
+diesel_migrations = { version = "1.3.0", features = ["sqlite"] }
 error-chain = "0.12.0"
 getopts = "0.2.15"
-hyper = "0.11.2"
+hyper = "0.12.11"
 id3 = "0.2.3"
 image = "0.20.0"
 iron = "0.5.1"
 rustfm-scrobble = "0.9.1"
 lewton = "0.9.1"
-log = "0.3.8"
+log = "0.4.5"
 md5 = "0.4.0"
 metaflac = "0.1.8"
 mount = "0.3.0"

diesel.toml

@@ -0,0 +1,2 @@
+[print_schema]
+file = "src/db/schema.rs"

src/db/mod.rs

@@ -13,8 +13,8 @@ mod schema;
 pub use self::schema::*;
 
 #[allow(dead_code)]
-const DB_MIGRATIONS_PATH: &str = "src/db/migrations";
-embed_migrations!("src/db/migrations");
+const DB_MIGRATIONS_PATH: &str = "migrations";
+embed_migrations!("migrations");
 
 pub trait ConnectionSource {
 	fn get_connection(&self) -> MutexGuard<SqliteConnection>;

src/db/schema.rs

@@ -1 +1,99 @@
-infer_schema!("src/db/schema.sqlite");
+table! {
+    ddns_config (id) {
+        id -> Integer,
+        host -> Text,
+        username -> Text,
+        password -> Text,
+    }
+}
+
+table! {
+    directories (id) {
+        id -> Integer,
+        path -> Text,
+        parent -> Nullable<Text>,
+        artist -> Nullable<Text>,
+        year -> Nullable<Integer>,
+        album -> Nullable<Text>,
+        artwork -> Nullable<Text>,
+        date_added -> Integer,
+    }
+}
+
+table! {
+    misc_settings (id) {
+        id -> Integer,
+        auth_secret -> Text,
+        index_sleep_duration_seconds -> Integer,
+        index_album_art_pattern -> Text,
+        prefix_url -> Text,
+    }
+}
+
+table! {
+    mount_points (id) {
+        id -> Integer,
+        source -> Text,
+        name -> Text,
+    }
+}
+
+table! {
+    playlist_songs (id) {
+        id -> Integer,
+        playlist -> Integer,
+        path -> Text,
+        ordering -> Integer,
+    }
+}
+
+table! {
+    playlists (id) {
+        id -> Integer,
+        owner -> Integer,
+        name -> Text,
+    }
+}
+
+table! {
+    songs (id) {
+        id -> Integer,
+        path -> Text,
+        parent -> Text,
+        track_number -> Nullable<Integer>,
+        disc_number -> Nullable<Integer>,
+        title -> Nullable<Text>,
+        artist -> Nullable<Text>,
+        album_artist -> Nullable<Text>,
+        year -> Nullable<Integer>,
+        album -> Nullable<Text>,
+        artwork -> Nullable<Text>,
+        duration -> Nullable<Integer>,
+    }
+}
+
+table! {
+    users (id) {
+        id -> Integer,
+        name -> Text,
+        password_salt -> Binary,
+        password_hash -> Binary,
+        admin -> Integer,
+        lastfm_username -> Nullable<Text>,
+        lastfm_session_key -> Nullable<Text>,
+    }
+}
+
+joinable!(playlist_songs -> playlists (playlist));
+joinable!(playlists -> users (owner));
+
+allow_tables_to_appear_in_same_query!(
+    ddns_config,
+    directories,
+    misc_settings,
+    mount_points,
+    playlist_songs,
+    playlists,
+    songs,
+    users,
+);

src/index.rs

@@ -3,7 +3,7 @@ use diesel;
 use diesel::dsl::sql;
 use diesel::prelude::*;
 use diesel::sqlite::SqliteConnection;
-use diesel::types;
+use diesel::sql_types;
 use regex::Regex;
 use std::fs;
 use std::path::Path;
@@ -28,7 +28,7 @@ const INDEX_BUILDING_CLEAN_BUFFER_SIZE: usize = 500; // Insertions in each trans
 
 no_arg_sql_function!(
 	random,
-	types::Integer,
+	sql_types::Integer,
 	"Represents the SQL RANDOM() function"
 );
 
@@ -512,7 +512,7 @@ where
 
 		let real_directories: Vec<Directory> = directories::table
 			.filter(directories::parent.eq(&real_path_string))
-			.order(sql::<types::Bool>("path COLLATE NOCASE ASC"))
+			.order(sql::<sql_types::Bool>("path COLLATE NOCASE ASC"))
 			.load(connection.deref())?;
 		let virtual_directories = real_directories
 			.into_iter()
@@ -521,7 +521,7 @@ where
 
 		let real_songs: Vec<Song> = songs::table
 			.filter(songs::parent.eq(&real_path_string))
-			.order(sql::<types::Bool>("path COLLATE NOCASE ASC"))
+			.order(sql::<sql_types::Bool>("path COLLATE NOCASE ASC"))
 			.load(connection.deref())?;
 		let virtual_songs = real_songs
 			.into_iter()

src/main.rs

@@ -7,8 +7,6 @@ extern crate crypto;
 #[macro_use]
 extern crate diesel;
 #[macro_use]
-extern crate diesel_infer_schema;
-#[macro_use]
 extern crate diesel_migrations;
 #[macro_use]
 extern crate error_chain;

src/playlist.rs

@@ -2,7 +2,7 @@ use core::clone::Clone;
 use core::ops::Deref;
 use diesel;
 use diesel::prelude::*;
-use diesel::types::*;
+use diesel::sql_types;
 use diesel::BelongingToDsl;
 use std::path::Path;
 
@@ -188,7 +188,7 @@ where
 			WHERE ps.playlist = ?
 			ORDER BY ps.ordering
 		"#);
-		let query = query.clone().bind::<Integer, _>(playlist.id);
+		let query = query.clone().bind::<sql_types::Integer, _>(playlist.id);
 		songs = query.get_results(connection.deref())?;
 	}
 

update_db_schema.bat

@@ -0,0 +1,6 @@
+cargo install diesel_cli --no-default-features --features "sqlite-bundled"
+
+mkdir tmp
+diesel --database-url tmp/print-schema.sqlite setup
+diesel --database-url tmp/print-schema.sqlite migration run
+rmdir /q /s tmp