feat(code): change function return types to use "diesel::" prefix"

and remove explicit import

Author: hasezoey

src/code.rs

@@ -464,7 +464,7 @@ fn build_table_fns(
             buffer.push_str(&format!(
             r##"
     /// Insert a new row into `{table_name}` with a given [`{create_struct_identifier}`]
-    pub{async_keyword} fn create(db: &mut ConnectionType, item: &{create_struct_identifier}) -> QueryResult<Self> {{
+    pub{async_keyword} fn create(db: &mut ConnectionType, item: &{create_struct_identifier}) -> diesel::QueryResult<Self> {{
         use {schema_path}{table_name}::dsl::*;
 
         diesel::insert_into({table_name}).values(item).get_result::<Self>(db){await_keyword}
@@ -475,7 +475,7 @@ fn build_table_fns(
             buffer.push_str(&format!(
                 r##"
     /// Insert a new row into `{table_name}` with all default values
-    pub{async_keyword} fn create(db: &mut ConnectionType) -> QueryResult<Self> {{
+    pub{async_keyword} fn create(db: &mut ConnectionType) -> diesel::QueryResult<Self> {{
         use {schema_path}{table_name}::dsl::*;
 
         diesel::insert_into({table_name}).default_values().get_result::<Self>(db){await_keyword}
@@ -495,7 +495,7 @@ fn build_table_fns(
     buffer.push_str(&format!(
         r##"
     /// Get a row from `{table_name}`, identified by the primary {key_maybe_multiple}
-    pub{async_keyword} fn read(db: &mut ConnectionType, {item_id_params}) -> QueryResult<Self> {{
+    pub{async_keyword} fn read(db: &mut ConnectionType, {item_id_params}) -> diesel::QueryResult<Self> {{
         use {schema_path}{table_name}::dsl::*;
 
         {table_name}.{item_id_filters}.first::<Self>(db){await_keyword}
@@ -505,7 +505,7 @@ fn build_table_fns(
 
     buffer.push_str(&format!(r##"
     /// Paginates through the table where page is a 0-based index (i.e. page 0 is the first page)
-    pub{async_keyword} fn paginate(db: &mut ConnectionType, page: i64, page_size: i64) -> QueryResult<PaginationResult<Self>> {{
+    pub{async_keyword} fn paginate(db: &mut ConnectionType, page: i64, page_size: i64) -> diesel::QueryResult<PaginationResult<Self>> {{
         use {schema_path}{table_name}::dsl::*;
 
         let page_size = if page_size < 1 {{ 1 }} else {{ page_size }};
@@ -534,7 +534,7 @@ fn build_table_fns(
 
         buffer.push_str(&format!(r##"
     /// Update a row in `{table_name}`, identified by the primary {key_maybe_multiple} with [`{update_struct_identifier}`]
-    pub{async_keyword} fn update(db: &mut ConnectionType, {item_id_params}, item: &{update_struct_identifier}) -> QueryResult<Self> {{
+    pub{async_keyword} fn update(db: &mut ConnectionType, {item_id_params}, item: &{update_struct_identifier}) -> diesel::QueryResult<Self> {{
         use {schema_path}{table_name}::dsl::*;
 
         diesel::update({table_name}.{item_id_filters}).set(item).get_result(db){await_keyword}
@@ -546,7 +546,7 @@ fn build_table_fns(
         buffer.push_str(&format!(
             r##"
     /// Delete a row in `{table_name}`, identified by the primary {key_maybe_multiple}
-    pub{async_keyword} fn delete(db: &mut ConnectionType, {item_id_params}) -> QueryResult<usize> {{
+    pub{async_keyword} fn delete(db: &mut ConnectionType, {item_id_params}) -> diesel::QueryResult<usize> {{
         use {schema_path}{table_name}::dsl::*;
 
         diesel::delete({table_name}.{item_id_filters}).execute(db){await_keyword}
@@ -628,10 +628,6 @@ fn build_imports(table: &ParsedTableMacro, config: &GenerationConfig) -> String
     // no "::" because that is already included in the schema_path
     imports_vec.push(format!("use {}*;", config.schema_path));
 
-    if table_options.get_fns() {
-        imports_vec.push("use diesel::QueryResult;".into());
-    };
-
     if config.once_common_structs || config.once_connection_type {
         imports_vec.push(format!("use {}common::*;", config.model_path));
     };

test/autogenerated_all/models/todos/generated.rs

@@ -2,7 +2,6 @@
 
 use crate::diesel::*;
 use crate::schema::*;
-use diesel::QueryResult;
 
 pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
@@ -41,21 +40,21 @@ pub struct PaginationResult<T> {
 
 impl Todos {
     /// Insert a new row into `todos` with all default values
-    pub fn create(db: &mut ConnectionType) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::insert_into(todos).default_values().get_result::<Self>(db)
     }
 
     /// Get a row from `todos`, 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::schema::todos::dsl::*;
 
         todos.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::schema::todos::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -73,14 +72,14 @@ impl Todos {
     }
 
     /// Update a row in `todos`, identified by the primary key with [`UpdateTodos`]
-    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::update(todos.filter(id.eq(param_id))).set(item).get_result(db)
     }
 
     /// Delete a row in `todos`, 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::schema::todos::dsl::*;
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)

test/autogenerated_attributes/models/todos/generated.rs

@@ -2,7 +2,6 @@
 
 use crate::diesel::*;
 use crate::schema::*;
-use diesel::QueryResult;
 
 pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
@@ -49,21 +48,21 @@ pub struct PaginationResult<T> {
 
 impl Todos {
     /// Insert a new row into `todos` with a given [`CreateTodos`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::insert_into(todos).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `todos`, 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::schema::todos::dsl::*;
 
         todos.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::schema::todos::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -81,14 +80,14 @@ impl Todos {
     }
 
     /// Update a row in `todos`, identified by the primary key with [`UpdateTodos`]
-    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::update(todos.filter(id.eq(param_id))).set(item).get_result(db)
     }
 
     /// Delete a row in `todos`, 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::schema::todos::dsl::*;
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)

test/autogenerated_primary_keys/models/todos/generated.rs

@@ -2,7 +2,6 @@
 
 use crate::diesel::*;
 use crate::schema::*;
-use diesel::QueryResult;
 
 pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
@@ -49,21 +48,21 @@ pub struct PaginationResult<T> {
 
 impl Todos {
     /// Insert a new row into `todos` with a given [`CreateTodos`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::insert_into(todos).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `todos`, 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::schema::todos::dsl::*;
 
         todos.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::schema::todos::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -81,14 +80,14 @@ impl Todos {
     }
 
     /// Update a row in `todos`, identified by the primary key with [`UpdateTodos`]
-    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::update(todos.filter(id.eq(param_id))).set(item).get_result(db)
     }
 
     /// Delete a row in `todos`, 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::schema::todos::dsl::*;
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)

test/cleanup_generated_content/models/todos/generated.rs

@@ -2,7 +2,6 @@
 
 use crate::diesel::*;
 use crate::schema::*;
-use diesel::QueryResult;
 
 pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
@@ -65,21 +64,21 @@ pub struct PaginationResult<T> {
 
 impl Todos {
     /// Insert a new row into `todos` with a given [`CreateTodos`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::insert_into(todos).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `todos`, 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::schema::todos::dsl::*;
 
         todos.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::schema::todos::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -97,14 +96,14 @@ impl Todos {
     }
 
     /// Update a row in `todos`, identified by the primary key with [`UpdateTodos`]
-    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param_id: i32, item: &UpdateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::update(todos.filter(id.eq(param_id))).set(item).get_result(db)
     }
 
     /// Delete a row in `todos`, 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::schema::todos::dsl::*;
 
         diesel::delete(todos.filter(id.eq(param_id))).execute(db)

test/create_update_str_cow/models/todos/generated.rs

@@ -2,7 +2,6 @@
 
 use crate::diesel::*;
 use crate::schema::*;
-use diesel::QueryResult;
 
 pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
@@ -63,21 +62,21 @@ pub struct PaginationResult<T> {
 
 impl Todos {
     /// Insert a new row into `todos` with a given [`CreateTodos`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::insert_into(todos).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `todos`, identified by the primary key
-    pub fn read(db: &mut ConnectionType, param_text: String) -> QueryResult<Self> {
+    pub fn read(db: &mut ConnectionType, param_text: String) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         todos.filter(text.eq(param_text)).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::schema::todos::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -95,14 +94,14 @@ impl Todos {
     }
 
     /// Update a row in `todos`, identified by the primary key with [`UpdateTodos`]
-    pub fn update(db: &mut ConnectionType, param_text: String, item: &UpdateTodos) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param_text: String, item: &UpdateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::update(todos.filter(text.eq(param_text))).set(item).get_result(db)
     }
 
     /// Delete a row in `todos`, identified by the primary key
-    pub fn delete(db: &mut ConnectionType, param_text: String) -> QueryResult<usize> {
+    pub fn delete(db: &mut ConnectionType, param_text: String) -> diesel::QueryResult<usize> {
         use crate::schema::todos::dsl::*;
 
         diesel::delete(todos.filter(text.eq(param_text))).execute(db)

test/create_update_str_str/models/todos/generated.rs

@@ -2,7 +2,6 @@
 
 use crate::diesel::*;
 use crate::schema::*;
-use diesel::QueryResult;
 
 pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::pg::PgConnection>>;
 
@@ -63,21 +62,21 @@ pub struct PaginationResult<T> {
 
 impl Todos {
     /// Insert a new row into `todos` with a given [`CreateTodos`]
-    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> QueryResult<Self> {
+    pub fn create(db: &mut ConnectionType, item: &CreateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::insert_into(todos).values(item).get_result::<Self>(db)
     }
 
     /// Get a row from `todos`, identified by the primary key
-    pub fn read(db: &mut ConnectionType, param_text: String) -> QueryResult<Self> {
+    pub fn read(db: &mut ConnectionType, param_text: String) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         todos.filter(text.eq(param_text)).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::schema::todos::dsl::*;
 
         let page_size = if page_size < 1 { 1 } else { page_size };
@@ -95,14 +94,14 @@ impl Todos {
     }
 
     /// Update a row in `todos`, identified by the primary key with [`UpdateTodos`]
-    pub fn update(db: &mut ConnectionType, param_text: String, item: &UpdateTodos) -> QueryResult<Self> {
+    pub fn update(db: &mut ConnectionType, param_text: String, item: &UpdateTodos) -> diesel::QueryResult<Self> {
         use crate::schema::todos::dsl::*;
 
         diesel::update(todos.filter(text.eq(param_text))).set(item).get_result(db)
     }
 
     /// Delete a row in `todos`, identified by the primary key
-    pub fn delete(db: &mut ConnectionType, param_text: String) -> QueryResult<usize> {
+    pub fn delete(db: &mut ConnectionType, param_text: String) -> diesel::QueryResult<usize> {
         use crate::schema::todos::dsl::*;
 
         diesel::delete(todos.filter(text.eq(param_text))).execute(db)