Skip to content

Commit da5629e

Browse files
committed
Converted to heck which is probably more robust.
1 parent 8c0a166 commit da5629e

7 files changed

Lines changed: 7 additions & 14 deletions

File tree

diesel_cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ chrono = "0.4"
2020
clap = "2.27"
2121
diesel = { version = "~1.4.0", default-features = false }
2222
dotenv = ">=0.8, <0.11"
23+
heck = "0.3.1"
2324
migrations_internals = "~1.4.0"
2425
serde = { version = "1.0.0", features = ["derive"] }
2526
tempfile = "3.0.0"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nicholas@172-18-33-126.dynapool.nyu.edu.356

diesel_cli/src/infer_schema_internals/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ mod data_structures;
22
mod foreign_keys;
33
mod inference;
44
mod table_data;
5-
mod utils;
65

76
#[cfg(feature = "uses_information_schema")]
87
mod information_schema;

diesel_cli/src/infer_schema_internals/mysql.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use diesel::mysql::Mysql;
22
use diesel::*;
3+
use heck::CamelCase;
34
use std::error::Error;
45

56
use super::data_structures::*;
67
use super::information_schema::UsesInformationSchema;
78
use super::table_data::TableName;
8-
use super::utils::to_camel_case;
99

1010
mod information_schema {
1111
table! {
@@ -85,7 +85,7 @@ pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box
8585
let unsigned = determine_unsigned(&attr.type_name);
8686

8787
Ok(ColumnType {
88-
rust_name: to_camel_case(tpe.trim()),
88+
rust_name: tpe.trim().to_camel_case(),
8989
is_array: false,
9090
is_nullable: attr.nullable,
9191
is_unsigned: unsigned,

diesel_cli/src/infer_schema_internals/pg.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use super::data_structures::*;
2-
use super::utils::to_camel_case;
2+
use heck::CamelCase;
33
use std::error::Error;
44
use std::io::{stderr, Write};
55

@@ -28,7 +28,7 @@ pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box
2828
}
2929

3030
Ok(ColumnType {
31-
rust_name: to_camel_case(tpe),
31+
rust_name: tpe.to_camel_case(),
3232
is_array,
3333
is_nullable: attr.nullable,
3434
is_unsigned: false,

diesel_cli/src/infer_schema_internals/utils.rs

Lines changed: 0 additions & 9 deletions
This file was deleted.

diesel_cli/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ extern crate clap;
2020
#[macro_use]
2121
extern crate diesel;
2222
extern crate dotenv;
23+
extern crate heck;
2324
extern crate migrations_internals;
2425
#[macro_use]
2526
extern crate serde;

0 commit comments

Comments
 (0)