diff options
| -rw-r--r-- | src/lib.rs | 2 | ||||
| -rw-r--r-- | src/main.rs | 11 | ||||
| -rw-r--r-- | src/sqlite.rs | 25 |
3 files changed, 33 insertions, 5 deletions
@@ -1 +1 @@ -mod sqlite; +pub mod sqlite; diff --git a/src/main.rs b/src/main.rs index d289b01..e064baa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,7 +31,7 @@ fn main() { fn yaml_extract( doc: &yaml::Yaml, tx: &rusqlite::Transaction, - table_columns: &HashMap<String, String>, + table_columns: &HashMap<String, rusqlite::types::Type>, ) { match doc { yaml::Yaml::Array(ref array) => { @@ -71,7 +71,7 @@ struct Zero {} use std::collections::HashMap; -fn get_column_names(dbconn: &rusqlite::Connection) -> HashMap<String, String> { +fn get_column_names(dbconn: &rusqlite::Connection) -> HashMap<String, rusqlite::types::Type> { let mut column_names = HashMap::new(); let mut stmt = dbconn.prepare(r#" @@ -103,8 +103,11 @@ fn get_column_names(dbconn: &rusqlite::Connection) -> HashMap<String, String> { let row = row_result.unwrap(); - // TODO: Translate to rusqlite::types::Type. - column_names.insert(row.0, row.1); + let type_name: String = row.1; + + let type_affinity = yaqlite::sqlite::affinity(&type_name); + + column_names.insert(row.0, type_affinity); } column_names diff --git a/src/sqlite.rs b/src/sqlite.rs index 10dbb61..8094398 100644 --- a/src/sqlite.rs +++ b/src/sqlite.rs @@ -6,4 +6,29 @@ use rusqlite; /// Use the SQLite rules for type affinity described in: /// https://sqlite.org/datatype3.html#determination_of_column_affinity pub fn affinity(type_name: &str) -> rusqlite::types::Type { + use rusqlite::types::Type; + + let type_name = type_name.to_uppercase(); + + if type_name.contains("INT") { + return Type::Integer; + } else if type_name.contains("CHAR") + || type_name.contains("CLOB") + || type_name.contains("TEXT") + { + return Type::Text; + } else if type_name.contains("BLOB") + || type_name.is_empty() + { + return Type::Blob; + } else if type_name.contains("REAL") + || type_name.contains("FLOA") + || type_name.contains("DOUB") + { + return Type::Real; + } + + // TODO: Numeric affinity + + Type::Text } |