fix(code): change "type ConnectionType" to be public

hasezoey · hasezoey · commit 658d0397c683 · 2023-11-02T15:51:15.000+01:00
which was broken for "once-connection-type" re cc0ecf2
diff --git a/src/code.rs b/src/code.rs
@@ -590,7 +590,7 @@ pub fn generate_common_structs(table_options: &TableOptions<'_>) -> String {
 /// Generate connection-type type
 pub fn generate_connection_type(config: &GenerationConfig) -> String {
     format!(
-        "type ConnectionType = {connection_type};",
+        "pub type ConnectionType = {connection_type};",
         connection_type = config.connection_type,
     )
 }
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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/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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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/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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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/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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `tableB`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable, Associations, Identifiable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `users`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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::*;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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::*;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `table2`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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,
 }
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
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,
 }
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
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 */
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `tableSuffix`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/simple_table_async/models/todos/generated.rs b/test/simple_table_async/models/todos/generated.rs
@@ -5,7 +5,7 @@ use diesel_async::RunQueryDsl;
 use crate::schema::*;
 use diesel::QueryResult;
 
-type ConnectionType = diesel_async::pooled_connection::deadpool::Object<diesel_async::AsyncPgConnection>;
+pub type ConnectionType = diesel_async::pooled_connection::deadpool::Object<diesel_async::AsyncPgConnection>;
 
 /// 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/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;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/simple_table_no_serde/models/todos/generated.rs b/test/simple_table_no_serde/models/todos/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `todos`
 #[derive(Debug, Clone, Queryable, Selectable)]
diff --git a/test/single_model_file/models/table1.rs b/test/single_model_file/models/table1.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `table1`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/single_model_file/models/table2.rs b/test/single_model_file/models/table2.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `table2`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]
diff --git a/test/use_statements/models/fang_tasks/generated.rs b/test/use_statements/models/fang_tasks/generated.rs
@@ -4,7 +4,7 @@ use diesel::*;
 use crate::schema::*;
 use diesel::QueryResult;
 
-type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
+pub type ConnectionType = diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
 
 /// Struct representing a row in table `fang_tasks`
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Queryable, Selectable)]

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,7 @@ pub fn generate_common_structs(table_options: &TableOptions<'_>) -> String {`
`590`	`590`	`/// Generate connection-type type`
`591`	`591`	`pub fn generate_connection_type(config: &GenerationConfig) -> String {`
`592`	`592`	`format!(`
`593`		`- "type ConnectionType = {connection_type};",`
	`593`	`+ "pub type ConnectionType = {connection_type};",`
`594`	`594`	`connection_type = config.connection_type,`
`595`	`595`	`)`
`596`	`596`	`}`