Move more thing around

1. Move everything related to migrations into diesel_migration
 - diesel_migrations/migrations_internals contains everything that was
 in diesel/src/migrations
 - diesel_migrations/migrations_macros contains the procedural macro
 implementation for `embed_migrations!`
 - diesel_migrations rexports everything related to migrations

2. Rename and restructure diesel_proc_macro
  - diesel_infer_schema is moved and renamed to
  diesel_infer_schema/infer_schema_internals
  - diesel_proc_macro_internal is moved to
  diesel_infer_schema/infer_schema_macros and everything related to
  migrations is removed
  - diesel_proc_macro is renamed to diesel_infer_schema and everything
  related to migrations is removed

3. Fix hopefully all other crates

Author: weiznich

.appveyor.yml

@@ -45,8 +45,18 @@ test_script:
   - cargo test
   - cd ../diesel
   - cargo test --features "%backend% extras"
-  - cd ../diesel_proc_macro
+  - cd ../diesel_infer_schema/infer_schema_internals
+  - cargo test --features "%backend%"
+  - cd ../../diesel_infer_schema/infer_schema_macros
+  - cargo test --features "%backend% dotenv"
+  - cd ../../diesel_infer_schema
   - cargo test --features "%backend% dotenv_macro"
+  - cd ../diesel_migrations/migrations_internals
+  - cargo test
+  - cd ../../diesel_migrations/migrations_macros
+  - cargo test
+  - cd ../../diesel_migrations/
+  - cargo test --features "%backend%"
   - cd ../diesel_cli
   - cargo test --no-default-features --features "%backend%"
   - cd ../diesel_tests

.travis.yml

@@ -14,13 +14,13 @@ before_script:
   - mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'travis'@'%';" -uroot
 script:
 - |
-  (cd diesel_codegen && travis-cargo test) &&
   if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then
     (cd diesel && travis-cargo test -- --no-default-features --features "unstable extras $BACKEND")
   else
     (cd diesel && travis-cargo test -- --no-default-features --features "extras $BACKEND")
   fi &&
   (cd diesel && travis-cargo test -- --no-default-features --features "extras with-deprecated $BACKEND") &&
+    (cd diesel_codegen && travis-cargo test -- --features "$BACKEND") &&
   if [[ "$BACKEND" == postgres ]]; then
     (cd examples/postgres && ./test_all)
   fi &&
@@ -31,9 +31,12 @@ script:
     (cd examples/sqlite && ./test_all)
   fi &&
   (cd diesel_cli && travis-cargo test -- --no-default-features --features "$BACKEND") &&
-  (cd diesel_infer_schema && travis-cargo test -- --no-default-features --features "$BACKEND") &&
-  (cd diesel_proc_macro_internal && travis-cargo test -- --no-default-features --features "dotenv $BACKEND") &&
-  (cd diesel_proc_macro && travis-cargo test -- --no-default-features --features "dotenv_macro $BACKEND") &&
+  (cd diesel_infer_schema/infer_schema_internals && travis-cargo test -- --no-default-features --features "$BACKEND") &&
+  (cd diesel_infer_schema/infer_schema_macros && travis-cargo test -- --no-default-features --features "$BACKEND") &&
+  (cd diesel_infer_schema && travis-cargo test -- --no-default-features --features "dotenv_macro $BACKEND") &&
+  (cd diesel_migrations/migrations_internals && travis-cargo test ) &&
+  (cd diesel_migrations/migrations_macros && travis-cargo test ) &&
+  (cd diesel_migrations/ && travis-cargo test --features "$BACKEND" ) &&
   if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then
     (cd diesel_tests && travis-cargo test -- --no-default-features --features "unstable $BACKEND")
   else

Cargo.toml

@@ -7,8 +7,11 @@ members = [
     # "diesel_compile_tests",
     "diesel_tests",
     "diesel_infer_schema",
-    "diesel_proc_macro",
-    "diesel_proc_macro_internal",
+    "diesel_infer_schema/infer_schema_internals",
+    "diesel_infer_schema/infer_schema_macros",
+    "diesel_migrations",
+    "diesel_migrations/migrations_internals",
+    "diesel_migrations/migrations_macros",
     "examples/mysql/getting_started_step_1",
     "examples/mysql/getting_started_step_2",
     "examples/mysql/getting_started_step_3",
@@ -25,5 +28,3 @@ members = [
 "diesel:0.16.0" = { path = "diesel" }
 "diesel_codegen:0.16.0" = { path = "diesel_codegen" }
 "diesel_infer_schema:0.16.0" = { path = "diesel_infer_schema" }
-"diesel_proc_macro_internal:0.16.0" = { path = "diesel_proc_macro_internal" }
-"diesel_proc_macro:0.16.0" = { path = "diesel_proc_macro" }

diesel/Cargo.toml

@@ -39,7 +39,7 @@ quickcheck = "0.4"
 tempdir = "^0.3.4"
 
 [features]
-default = ["with-deprecated"]
+default = ["with-deprecated", "sqlite"]
 extras = ["chrono", "serde_json", "uuid", "deprecated-time", "network-address", "numeric"]
 unstable = []
 lint = ["clippy"]

diesel/src/lib.rs

@@ -72,7 +72,6 @@ pub mod pg;
 #[cfg(feature = "sqlite")]
 pub mod sqlite;
 
-pub mod migrations;
 pub mod query_dsl;
 pub mod query_source;
 pub mod result;

diesel_cli/Cargo.toml

@@ -19,8 +19,9 @@ chrono = "0.4"
 clap = ">=2.27.0"
 diesel = { version = "0.16.0", default-features = false }
 dotenv = ">=0.8, <0.11"
-diesel_infer_schema = "0.16.0"
+infer_schema_internals = { version = "0.16.0", path = "../diesel_infer_schema/infer_schema_internals" }
 clippy = { optional = true, version = "=0.0.162" }
+migrations_internals = { version = "0.16.0", path = "../diesel_migrations/migrations_internals" }
 
 [dev-dependencies]
 difference = "1.0"
@@ -31,9 +32,9 @@ url = { version = "1.4.0" }
 [features]
 default = ["postgres", "sqlite", "mysql"]
 lint = ["clippy"]
-postgres = ["diesel/postgres", "diesel_infer_schema/postgres"]
-sqlite = ["diesel/sqlite", "diesel_infer_schema/sqlite"]
-mysql = ["diesel/mysql", "diesel_infer_schema/mysql"]
+postgres = ["diesel/postgres", "infer_schema_internals/postgres"]
+sqlite = ["diesel/sqlite", "infer_schema_internals/sqlite"]
+mysql = ["diesel/mysql", "infer_schema_internals/mysql"]
 
 [[test]]
 name = "tests"

diesel_cli/src/database.rs

@@ -2,6 +2,7 @@ use clap::ArgMatches;
 use diesel::dsl::sql;
 use diesel::types::Bool;
 use diesel::*;
+use migrations_internals as migrations;
 #[cfg(any(feature = "postgres", feature = "mysql"))]
 use super::query_helper;
 

diesel_cli/src/main.rs

@@ -14,8 +14,9 @@ extern crate chrono;
 extern crate clap;
 #[cfg_attr(any(feature = "mysql", feature = "postgres"), macro_use)]
 extern crate diesel;
-extern crate diesel_infer_schema;
+extern crate infer_schema_internals;
 extern crate dotenv;
+extern crate migrations_internals;
 
 mod database_error;
 #[macro_use]
@@ -27,14 +28,14 @@ mod query_helper;
 
 use chrono::*;
 use clap::{ArgMatches, Shell};
-use diesel::migrations::{self, MigrationConnection};
+use migrations_internals::{self as migrations, MigrationConnection};
 use std::any::Any;
 use std::io::stdout;
 use std::path::{Path, PathBuf};
 use std::{env, fs};
 
 use self::database_error::{DatabaseError, DatabaseResult};
-use diesel::migrations::TIMESTAMP_FORMAT;
+use migrations_internals::TIMESTAMP_FORMAT;
 
 fn main() {
     use self::dotenv::dotenv;
@@ -303,7 +304,7 @@ fn convert_absolute_path_to_relative(target_path: &Path, mut current_path: &Path
 }
 
 fn run_infer_schema(matches: &ArgMatches) {
-    use diesel_infer_schema::TableName;
+    use infer_schema_internals::TableName;
     use print_schema::*;
 
     let database_url = database::database_url(matches);

diesel_cli/src/print_schema.rs

@@ -1,4 +1,4 @@
-use diesel_infer_schema::*;
+use infer_schema_internals::*;
 use std::error::Error;
 use std::fmt::{self, Display, Formatter, Write};
 

diesel_codegen/Cargo.toml

@@ -13,19 +13,23 @@ keywords = ["orm", "database", "postgres", "sql", "codegen"]
 [dependencies]
 syn = { version = "0.11.4", features = ["aster"] }
 quote = "0.3.12"
-dotenv = { version = ">=0.8, <0.11", optional = true, default-features = false }
 clippy = { optional = true, version = "=0.0.162" }
 
 [dev-dependencies]
+dotenv = { version = ">=0.8, <0.11", default-features = false }
 tempdir = "0.3.4"
-diesel = { version = "0.16", features = ["sqlite"] }
+diesel = { version = "0.16", features = ["sqlite", "postgres", "mysql"] }
+cfg-if = "0.1.0"
 
 [lib]
 proc-macro = true
 
 [features]
-default = ["dotenv"]
+default = []
 lint = ["clippy"]
+postgres = []
+sqlite = []
+mysql = []
 
 [[test]]
 name = "tests"