test: fix actual PgConnection paths

hasezoey · hasezoey · commit ce8d41b2f067 · 2023-11-02T18:59:48.000+01:00
diesel does not have "diesel::PgConnection", only in "::prelude" or "::pg"
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ cargo install dsync
 
 * `-i`: input argument: path to schema file
 * `-o`: output argument: path to directory where generated code should be written
-* `-c`: connection type (for example: `diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>`)  
+* `-c`: connection type (for example: `diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>`)  
 * `-g`: (optional, repeatable) list of columns that are automatically generated by create/update triggers (for example, `created_at`, `updated_at`)
 * `--tsync`: (optional) adds `#[tsync]` attribute to generated structs (see <https://github.com/Wulf/tsync>)
 * `--model-path`: (optional) set a custom model import path, default `crate::models::`
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -63,7 +63,7 @@ pub struct MainOptions {
     #[arg(short = 'g', long = "autogenerated-columns")]
     pub autogenerated_columns: Option<Vec<String>>,
 
-    /// rust type which describes a connection, for example: "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+    /// rust type which describes a connection, for example: "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
     #[arg(short = 'c', long = "connection-type")]
     pub connection_type: String,
 
diff --git a/test/autogenerated_all/models/todos/generated.rs b/test/autogenerated_all/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/autogenerated_all/test.sh b/test/autogenerated_all/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema.rs -o models -g id -g created_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/autogenerated_attributes/models/todos/generated.rs b/test/autogenerated_attributes/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/autogenerated_attributes/test.sh b/test/autogenerated_attributes/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g created_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema.rs -o models -g created_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/autogenerated_primary_keys/models/todos/generated.rs b/test/autogenerated_primary_keys/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/autogenerated_primary_keys/test.sh b/test/autogenerated_primary_keys/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema.rs -o models -g id -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/cleanup_generated_content/models/todos/generated.rs b/test/cleanup_generated_content/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/cleanup_generated_content/test.sh b/test/cleanup_generated_content/test.sh
@@ -4,5 +4,5 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema1.rs -o models -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
-cargo run -- -i schema2.rs -o models -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema1.rs -o models -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
+cargo run -- -i schema2.rs -o models -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/create_update_str_cow/models/todos/generated.rs b/test/create_update_str_cow/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/create_update_str_cow/test.sh b/test/create_update_str_cow/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --create-str=cow --update-str=cow
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --create-str=cow --update-str=cow
diff --git a/test/create_update_str_str/models/todos/generated.rs b/test/create_update_str_str/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/create_update_str_str/test.sh b/test/create_update_str_str/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --create-str=str --update-str=str
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --create-str=str --update-str=str
diff --git a/test/custom_model_and_schema_path/models/tableA/generated.rs b/test/custom_model_and_schema_path/models/tableA/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::data::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `tableA`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/custom_model_and_schema_path/models/tableB/generated.rs b/test/custom_model_and_schema_path/models/tableB/generated.rs
@@ -5,7 +5,7 @@ use crate::data::models::table_a::TableA;
 use crate::data::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `tableB`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable, Associations, Identifiable)]
diff --git a/test/custom_model_and_schema_path/test.sh b/test/custom_model_and_schema_path/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i data/schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --schema-path "crate::data::schema::" --model-path "crate::data::models::"
+cargo run -- -i data/schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --schema-path "crate::data::schema::" --model-path "crate::data::models::"
diff --git a/test/custom_model_path/models/tableA/generated.rs b/test/custom_model_path/models/tableA/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `tableA`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/custom_model_path/models/tableB/generated.rs b/test/custom_model_path/models/tableB/generated.rs
@@ -5,7 +5,7 @@ use crate::data::models::table_a::TableA;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `tableB`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable, Associations, Identifiable)]
diff --git a/test/custom_model_path/test.sh b/test/custom_model_path/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --model-path "crate::data::models::"
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --model-path "crate::data::models::"
diff --git a/test/manual_primary_keys/models/todos/generated.rs b/test/manual_primary_keys/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/manual_primary_keys/test.sh b/test/manual_primary_keys/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema.rs -o models -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/multiple_primary_keys/models/users/generated.rs b/test/multiple_primary_keys/models/users/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `users`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/multiple_primary_keys/test.sh b/test/multiple_primary_keys/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema.rs -o models -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/once_common_structs/models/table1/generated.rs b/test/once_common_structs/models/table1/generated.rs
@@ -5,7 +5,7 @@ use crate::schema::*;
 use diesel::QueryResult;
 use crate::models::common::*;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `table1`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/once_common_structs/models/table2/generated.rs b/test/once_common_structs/models/table2/generated.rs
@@ -5,7 +5,7 @@ use crate::schema::*;
 use diesel::QueryResult;
 use crate::models::common::*;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `table2`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/once_common_structs/test.sh b/test/once_common_structs/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --once-common-structs
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --once-common-structs
diff --git a/test/once_common_structs_once_connection_type/models/common.rs b/test/once_common_structs_once_connection_type/models/common.rs
@@ -14,4 +14,4 @@ pub struct PaginationResult<T> {
     pub num_pages: i64,
 }
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
diff --git a/test/once_common_structs_once_connection_type/test.sh b/test/once_common_structs_once_connection_type/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --once-common-structs --once-connection-type
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --once-common-structs --once-connection-type
diff --git a/test/once_common_structs_once_connection_type_single_file/models/common.rs b/test/once_common_structs_once_connection_type_single_file/models/common.rs
@@ -14,4 +14,4 @@ pub struct PaginationResult<T> {
     pub num_pages: i64,
 }
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
diff --git a/test/once_common_structs_once_connection_type_single_file/test.sh b/test/once_common_structs_once_connection_type_single_file/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --once-common-structs --once-connection-type --single-model-file
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --once-common-structs --once-connection-type --single-model-file
diff --git a/test/once_connection_type/models/common.rs b/test/once_connection_type/models/common.rs
@@ -1,3 +1,3 @@
 /* @generated and managed by dsync */
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
diff --git a/test/once_connection_type/test.sh b/test/once_connection_type/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --once-connection-type
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --once-connection-type
diff --git a/test/readonly/models/normal/generated.rs b/test/readonly/models/normal/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `normal`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/readonly/models/prefixTable/generated.rs b/test/readonly/models/prefixTable/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `prefixTable`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/readonly/models/prefixTableSuffix/generated.rs b/test/readonly/models/prefixTableSuffix/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `prefixTableSuffix`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/readonly/models/tableSuffix/generated.rs b/test/readonly/models/tableSuffix/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `tableSuffix`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/readonly/test.sh b/test/readonly/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --readonly-prefix prefix --readonly-suffix Suffix
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --readonly-prefix prefix --readonly-suffix Suffix
diff --git a/test/simple_table/models/todos/generated.rs b/test/simple_table/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/simple_table/test.sh b/test/simple_table/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"
+cargo run -- -i schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"
diff --git a/test/simple_table_custom_schema_path/models/todos/generated.rs b/test/simple_table_custom_schema_path/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::data::schema::*;
 use diesel::QueryResult;
 
-pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/simple_table_custom_schema_path/test.sh b/test/simple_table_custom_schema_path/test.sh
@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
 cd $SCRIPT_DIR
 
-cargo run -- -i data/schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>" --schema-path "crate::data::schema::"
+cargo run -- -i data/schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>" --schema-path "crate::data::schema::"
diff --git a/test/simple_table_no_crud/test.sh b/test/simple_table_no_crud/test.sh
diff --git a/test/simple_table_no_serde/models/todos/generated.rs b/test/simple_table_no_serde/models/todos/generated.rs
diff --git a/test/simple_table_no_serde/test.sh b/test/simple_table_no_serde/test.sh
diff --git a/test/single_model_file/models/table1.rs b/test/single_model_file/models/table1.rs
diff --git a/test/single_model_file/models/table2.rs b/test/single_model_file/models/table2.rs
diff --git a/test/single_model_file/test.sh b/test/single_model_file/test.sh
diff --git a/test/use_statements/models/fang_tasks/generated.rs b/test/use_statements/models/fang_tasks/generated.rs
diff --git a/test/use_statements/test.sh b/test/use_statements/test.sh

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"`
`4`	`4`
`5`	`5`	`cd $SCRIPT_DIR`
`6`	`6`
`7`		`-cargo run -- -i schema.rs -o models -g id -g created_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>"`
	`7`	`+cargo run -- -i schema.rs -o models -g id -g created_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::prelude::PgConnection>>"`