diff --git a/Cargo.toml b/Cargo.toml
index c30045b4..41b823dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -41,10 +41,8 @@ chrono = { version = "^0", optional = true }
 futures = { version = "^0.3" }
 futures-util = { version = "^0.3" }
 rust_decimal = { version = "^1", optional = true }
-sea-query = { version = "~0.12.8" }
-# sea-query = { path = "../sea-query" }
+sea-query = { version = "^0.12.8" }
 sea-orm-macros = { path = "sea-orm-macros", optional = true }
-sea-orm-codegen = { path = "sea-orm-codegen", optional = true }
 serde = { version = "^1.0", features = ["derive"] }
 sqlx = { version = "^0.5", optional = true }
 sqlx-core = { version = "^0.5", optional = true }
@@ -68,15 +66,13 @@ sea-orm = { path = ".", features = ["debug-print"] }
 debug-print = []
 default = [
     "macros",
-    "codegen",
+    "mock",
     "with-json",
     "with-chrono",
     "with-rust_decimal",
-    "mock",
     "with-uuid",
 ]
 macros = ["sea-orm-macros"]
-codegen = ["sea-orm-codegen"]
 mock = []
 with-json = ["serde_json", "sea-query/with-json", "sqlx-json"]
 with-chrono = ["chrono", "sea-query/with-chrono", "sqlx-chrono"]
diff --git a/sea-orm-cli/Cargo.toml b/sea-orm-cli/Cargo.toml
index 85fc693f..13c56cc1 100644
--- a/sea-orm-cli/Cargo.toml
+++ b/sea-orm-cli/Cargo.toml
@@ -20,13 +20,13 @@ clap = { version = "^2.33.3" }
 dotenv = { version = "^0.15" }
 async-std = { version = "^1.9", features = [ "attributes" ] }
 sea-orm-codegen = { path = "../sea-orm-codegen" }
-sea-schema = { version = "^0.2", git = "https://github.com/SeaQL/sea-schema.git", branch = "pg-discovery-writer", default-features = false, features = [
+sea-schema = { version = "^0.2.4", default-features = false, features = [
     "sqlx-mysql",
     "sqlx-postgres",
     "discovery",
     "writer",
 ] }
-sqlx = { version = "^0.5", default-features = false, features = [ "mysql" ] }
+sqlx = { version = "^0.5", default-features = false, features = [ "mysql", "postgres" ] }
 
 [features]
 default = [ "runtime-async-std-native-tls" ]
diff --git a/sea-orm-codegen/Cargo.toml b/sea-orm-codegen/Cargo.toml
index 86ccf937..f78914ba 100644
--- a/sea-orm-codegen/Cargo.toml
+++ b/sea-orm-codegen/Cargo.toml
@@ -16,7 +16,7 @@ name = "sea_orm_codegen"
 path = "src/lib.rs"
 
 [dependencies]
-sea-query = { version = "~0.12.8", git = "https://github.com/SeaQL/sea-query.git" }
+sea-query = { version = "^0.12.8" }
 syn = { version = "^1", default-features = false, features = [
     "derive",
     "parsing",