chore(test::custom_model_and_schema_path): actually use correct output path

it seems like the wrong one was used sicne the beginning

Author: hasezoey

test/custom_model_and_schema_path/data/models/table_a/generated.rs

@@ -2,20 +2,19 @@
 
 use crate::diesel::*;
 use crate::data::schema::*;
-use diesel::QueryResult;
 
-pub type ConnectionType = diesel::prelude::PgConnection;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
 /// Struct representing a row in table `tableA`
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable, QueryableByName)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, diesel::Queryable, diesel::Selectable, diesel::QueryableByName)]
 #[diesel(table_name=tableA, primary_key(_id))]
 pub struct TableA {
     /// Field representing column `_id`
     pub _id: i32,
 }
 
 /// Create Struct for a row in table `tableA` for [`TableA`]
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Insertable)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, diesel::Insertable)]
 #[diesel(table_name=tableA)]
 pub struct CreateTableA {
     /// Field representing column `_id`
@@ -39,21 +38,21 @@ pub struct PaginationResult<T> {
 
 impl TableA {
     /// Insert a new row into `tableA` with a given [`CreateTableA`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTableA) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTableA) -> diesel::QueryResult<Self> {
         use crate::data::schema::tableA::dsl::*;
 
-        insert_into(tableA).values(item).get_result::<Self>(db)
+        diesel::insert_into(tableA).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `tableA`, identified by the primary key
-    pub fn read(db: &mut ConnectionType, param__id: i32) -> QueryResult<Self> {
+    pub fn read(db: &mut ConnectionType, param__id: i32) -> diesel::QueryResult<Self> {
         use crate::data::schema::tableA::dsl::*;
 
         tableA.filter(_id.eq(param__id)).first::<Self>(db)
     }
 
     /// Paginates through the table where page is a 0-based index (i.e. page 0 is the first page)
-    pub fn paginate(db: &mut ConnectionType, page: i64, page_size: i64) -> QueryResult<PaginationResult<Self>> {
+    pub fn paginate(db: &mut ConnectionType, page: i64, page_size: i64) -> diesel::QueryResult<PaginationResult<Self>> {
         use crate::data::schema::tableA::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -71,7 +70,7 @@ impl TableA {
     }
 
     /// Delete a row in `tableA`, identified by the primary key
-    pub fn delete(db: &mut ConnectionType, param__id: i32) -> QueryResult<usize> {
+    pub fn delete(db: &mut ConnectionType, param__id: i32) -> diesel::QueryResult<usize> {
         use crate::data::schema::tableA::dsl::*;
 
         diesel::delete(tableA.filter(_id.eq(param__id))).execute(db)

test/custom_model_and_schema_path/data/models/table_b/generated.rs

@@ -3,12 +3,11 @@
 use crate::diesel::*;
 use crate::data::models::table_a::TableA;
 use crate::data::schema::*;
-use diesel::QueryResult;
 
-pub type ConnectionType = diesel::prelude::PgConnection;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
 /// Struct representing a row in table `tableB`
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable, QueryableByName, Associations, Identifiable)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, diesel::Queryable, diesel::Selectable, diesel::QueryableByName, diesel::Associations, diesel::Identifiable)]
 #[diesel(table_name=tableB, primary_key(_id), belongs_to(TableA, foreign_key=link))]
 pub struct TableB {
     /// Field representing column `_id`
@@ -18,7 +17,7 @@ pub struct TableB {
 }
 
 /// Create Struct for a row in table `tableB` for [`TableB`]
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Insertable)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, diesel::Insertable)]
 #[diesel(table_name=tableB)]
 pub struct CreateTableB {
     /// Field representing column `_id`
@@ -28,7 +27,7 @@ pub struct CreateTableB {
 }
 
 /// Update Struct for a row in table `tableB` for [`TableB`]
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, AsChangeset, PartialEq, Default)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, diesel::AsChangeset, PartialEq, Default)]
 #[diesel(table_name=tableB)]
 pub struct UpdateTableB {
     /// Field representing column `link`
@@ -52,21 +51,21 @@ pub struct PaginationResult<T> {
 
 impl TableB {
     /// Insert a new row into `tableB` with a given [`CreateTableB`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTableB) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTableB) -> diesel::QueryResult<Self> {
         use crate::data::schema::tableB::dsl::*;
 
-        insert_into(tableB).values(item).get_result::<Self>(db)
+        diesel::insert_into(tableB).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `tableB`, identified by the primary key
-    pub fn read(db: &mut ConnectionType, param__id: i32) -> QueryResult<Self> {
+    pub fn read(db: &mut ConnectionType, param__id: i32) -> diesel::QueryResult<Self> {
         use crate::data::schema::tableB::dsl::*;
 
         tableB.filter(_id.eq(param__id)).first::<Self>(db)
     }
 
     /// Paginates through the table where page is a 0-based index (i.e. page 0 is the first page)
-    pub fn paginate(db: &mut ConnectionType, page: i64, page_size: i64) -> QueryResult<PaginationResult<Self>> {
+    pub fn paginate(db: &mut ConnectionType, page: i64, page_size: i64) -> diesel::QueryResult<PaginationResult<Self>> {
         use crate::data::schema::tableB::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -84,14 +83,14 @@ impl TableB {
     }
 
     /// Update a row in `tableB`, identified by the primary key with [`UpdateTableB`]
-    pub fn update(db: &mut ConnectionType, param__id: i32, item: &UpdateTableB) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param__id: i32, item: &UpdateTableB) -> diesel::QueryResult<Self> {
         use crate::data::schema::tableB::dsl::*;
 
         diesel::update(tableB.filter(_id.eq(param__id))).set(item).get_result(db)
     }
 
     /// Delete a row in `tableB`, identified by the primary key
-    pub fn delete(db: &mut ConnectionType, param__id: i32) -> QueryResult<usize> {
+    pub fn delete(db: &mut ConnectionType, param__id: i32) -> diesel::QueryResult<usize> {
         use crate::data::schema::tableB::dsl::*;
 
         diesel::delete(tableB.filter(_id.eq(param__id))).execute(db)

test/custom_model_and_schema_path/models/mod.rs

@@ -5,4 +5,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 cd $SCRIPT_DIR
 
 cargo run --manifest-path ../../Cargo.toml -- \
--i data/schema.rs -o models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>" --schema-path "crate::data::schema::" --model-path "crate::data::models::"
+-i data/schema.rs -o data/models -g id -g created_at -g updated_at -c "diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>" --schema-path "crate::data::schema::" --model-path "crate::data::models::"