Merge pull request diesel-rs#2060 from NicholasLYang/camel-case-conversion

Camel case conversion

Author: weiznich

diesel_cli/Cargo.toml

@@ -20,6 +20,7 @@ chrono = "0.4"
 clap = "2.27"
 diesel = { version = "~1.4.0", default-features = false }
 dotenv = ">=0.8, <0.11"
+heck = "0.3.1"
 migrations_internals = "~1.4.0"
 serde = { version = "1.0.0", features = ["derive"] }
 tempfile = "3.0.0"

diesel_cli/src/infer_schema_internals/mysql.rs

@@ -1,5 +1,6 @@
 use diesel::mysql::Mysql;
 use diesel::*;
+use heck::CamelCase;
 use std::error::Error;
 
 use super::data_structures::*;
@@ -84,7 +85,7 @@ pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box
     let unsigned = determine_unsigned(&attr.type_name);
 
     Ok(ColumnType {
-        rust_name: capitalize(tpe.trim()),
+        rust_name: tpe.trim().to_camel_case(),
         is_array: false,
         is_nullable: attr.nullable,
         is_unsigned: unsigned,
@@ -119,10 +120,6 @@ fn determine_unsigned(sql_type_name: &str) -> bool {
     sql_type_name.to_lowercase().contains("unsigned")
 }
 
-fn capitalize(name: &str) -> String {
-    name[..1].to_uppercase() + &name[1..]
-}
-
 #[test]
 fn values_which_already_map_to_type_are_returned_unchanged() {
     assert_eq!("text", determine_type_name("text").unwrap());

diesel_cli/src/infer_schema_internals/pg.rs

@@ -1,8 +1,8 @@
+use super::data_structures::*;
+use heck::CamelCase;
 use std::error::Error;
 use std::io::{stderr, Write};
 
-use super::data_structures::*;
-
 pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<Error>> {
     let is_array = attr.type_name.starts_with('_');
     let tpe = if is_array {
@@ -28,13 +28,9 @@ pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box
     }
 
     Ok(ColumnType {
-        rust_name: capitalize(tpe),
+        rust_name: tpe.to_camel_case(),
         is_array,
         is_nullable: attr.nullable,
         is_unsigned: false,
     })
 }
-
-fn capitalize(name: &str) -> String {
-    name[..1].to_uppercase() + &name[1..]
-}

diesel_cli/src/main.rs

@@ -20,6 +20,7 @@ extern crate clap;
 #[macro_use]
 extern crate diesel;
 extern crate dotenv;
+extern crate heck;
 extern crate migrations_internals;
 #[macro_use]
 extern crate serde;

diesel_cli/tests/print_schema.rs

@@ -69,6 +69,12 @@ fn print_schema_column_renaming() {
     test_print_schema("print_schema_column_renaming", vec!["--with-docs"]);
 }
 
+#[test]
+#[cfg(feature = "postgres")]
+fn print_schema_type_renaming() {
+    test_print_schema("print_schema_type_renaming", vec!["--with-docs"]);
+}
+
 #[test]
 #[cfg(feature = "mysql")]
 fn print_schema_unsigned() {

diesel_cli/tests/print_schema/print_schema_type_renaming/diesel.toml

@@ -0,0 +1,3 @@
+[print_schema]
+file = "src/schema.rs"
+with_docs = true

diesel_cli/tests/print_schema/print_schema_type_renaming/postgres/expected.rs

@@ -0,0 +1,19 @@
+table! {
+    /// Representation of the `users` table.
+    ///
+    /// (Automatically generated by Diesel.)
+    users (id) {
+        /// The `id` column of the `users` table.
+        ///
+        /// Its SQL type is `Int4`.
+        ///
+        /// (Automatically generated by Diesel.)
+        id -> Int4,
+        /// The `job` column of the `users` table.
+        ///
+        /// Its SQL type is `UserJob`.
+        ///
+        /// (Automatically generated by Diesel.)
+        job -> UserJob,
+    }
+}

diesel_cli/tests/print_schema/print_schema_type_renaming/postgres/schema.sql

@@ -0,0 +1,7 @@
+CREATE TYPE user_job AS ENUM ('programmer', 'director', 'writer', 'mathematician');
+
+CREATE TABLE users (
+    id INTEGER PRIMARY KEY,
+    job user_job NOT NULL
+);
+