Archives
/
gobang
mirror of https://github.com/TaKO8Ki/gobang
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use else if to ensure that try_get is only called once.

Browse Source
pull/93/head
utam0k 3 years ago
parent 08a70fe76d
commit 922c605b39
4 changed files with 82 additions and 104 deletions
Show Stats Download Patch File Download Diff File

2
src/database/mod.rs
Unescape Escape View File

@ -53,6 +53,6 @@ pub trait TableRow: std::marker::Send {
#[macro_export]
macro_rules! get_or_null {
($value:expr) => {
return Ok($value.map_or("NULL".to_string(), |v| v.to_string()));
$value.map_or("NULL".to_string(), |v| v.to_string())
};
}

36
src/database/mysql.rs
Unescape Escape View File

@ -363,58 +363,58 @@ fn convert_column_value_to_string(row: &MySqlRow, column: &MySqlColumn) -> anyho
Ok(value.unwrap_or_else(|| NULL.to_string()))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<&str> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i8> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i16> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i32> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i64> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<f32> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<f64> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<u8> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<u16> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<u32> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<u64> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<rust_decimal::Decimal> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveDate> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveTime> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveDateTime> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<chrono::DateTime<chrono::Utc>> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<serde_json::Value> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<bool> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else {
anyhow::bail!(
"column type not implemented: `{}` {}",

85
src/database/postgres.rs
Unescape Escape View File

@ -469,23 +469,19 @@ fn convert_column_value_to_string(row: &PgRow, column: &PgColumn) -> anyhow::Res
let column_name = column.name();
if let Ok(value) = row.try_get(column_name) {
let value: Option<i16> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i32> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i64> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<rust_decimal::Decimal> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<&[u8]> = value;
return Ok(value.map_or("NULL".to_string(), |values| {
Ok(value.map_or("NULL".to_string(), |values| {
format!(
"\\x{}",
values
@ -493,51 +489,42 @@ fn convert_column_value_to_string(row: &PgRow, column: &PgColumn) -> anyhow::Res
.map(|v| format!("{:02x}", v))
.collect::<String>()
)
}));
}
if let Ok(value) = row.try_get(column_name) {
}))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveDate> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: String = value;
return Ok(value);
}
if let Ok(value) = row.try_get(column_name) {
Ok(value)
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<chrono::DateTime<chrono::Utc>> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<chrono::DateTime<chrono::Local>> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveDateTime> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveDate> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveTime> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<serde_json::Value> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get::<Option<bool>, _>(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get::<Option<bool>, _>(column_name) {
let value: Option<bool> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<Vec<String>> = value;
return Ok(value.map_or("NULL".to_string(), |v| v.join(",")));
Ok(value.map_or("NULL".to_string(), |v| v.join(",")))
} else {
anyhow::bail!(
"column type not implemented: `{}` {}",
column_name,
column.type_info().clone().name()
)
}
Err(anyhow::anyhow!(
"column type not implemented: `{}` {}",
column_name,
column.type_info().clone().name()
))
}

63
src/database/sqlite.rs
Unescape Escape View File

@ -349,51 +349,42 @@ fn convert_column_value_to_string(
let column_name = column.name();
if let Ok(value) = row.try_get(column_name) {
let value: Option<String> = value;
return Ok(value.unwrap_or_else(|| "NULL".to_string()));
}
if let Ok(value) = row.try_get(column_name) {
Ok(value.unwrap_or_else(|| "NULL".to_string()))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<&str> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i16> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i32> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<i64> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<f32> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<f64> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<chrono::DateTime<chrono::Utc>> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<chrono::DateTime<chrono::Local>> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<NaiveDateTime> = value;
get_or_null!(value)
}
if let Ok(value) = row.try_get(column_name) {
Ok(get_or_null!(value))
} else if let Ok(value) = row.try_get(column_name) {
let value: Option<bool> = value;
get_or_null!(value)
Ok(get_or_null!(value))
} else {
anyhow::bail!(
"column type not implemented: `{}` {}",
column_name,
column.type_info().clone().name()
)
}
Err(anyhow::anyhow!(
"column type not implemented: `{}` {}",
column_name,
column.type_info().clone().name()
))
}

Write Preview
Loading…
Cancel
Save