Skip to content

Commit f4aca02

Browse files
committed
port diesel cli
1 parent b3b1131 commit f4aca02

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

diesel_cli/src/infer_schema_internals/data_structures.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[cfg(feature = "uses_information_schema")]
22
use diesel::backend::Backend;
3-
use diesel::deserialize::{FromStaticSqlRow, Queryable};
3+
use diesel::deserialize::{self, FromStaticSqlRow, Queryable};
44
#[cfg(feature = "sqlite")]
55
use diesel::sqlite::Sqlite;
66

@@ -80,8 +80,8 @@ where
8080
{
8181
type Row = (String, String, String);
8282

83-
fn build(row: Self::Row) -> Self {
84-
ColumnInformation::new(row.0, row.1, row.2 == "YES")
83+
fn build(row: Self::Row) -> deserialize::Result<Self> {
84+
Ok(ColumnInformation::new(row.0, row.1, row.2 == "YES"))
8585
}
8686
}
8787

@@ -92,8 +92,8 @@ where
9292
{
9393
type Row = (i32, String, String, bool, Option<String>, bool);
9494

95-
fn build(row: Self::Row) -> Self {
96-
ColumnInformation::new(row.1, row.2, !row.3)
95+
fn build(row: Self::Row) -> deserialize::Result<Self> {
96+
Ok(ColumnInformation::new(row.1, row.2, !row.3))
9797
}
9898
}
9999

diesel_cli/src/infer_schema_internals/table_data.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use diesel::backend::Backend;
2-
use diesel::deserialize::{FromStaticSqlRow, Queryable};
2+
use diesel::deserialize::{self, FromStaticSqlRow, Queryable};
33
use std::fmt;
44
use std::str::FromStr;
55

@@ -60,8 +60,8 @@ where
6060
{
6161
type Row = (String, String);
6262

63-
fn build((name, schema): Self::Row) -> Self {
64-
TableName::new(name, schema)
63+
fn build((name, schema): Self::Row) -> deserialize::Result<Self> {
64+
Ok(TableName::new(name, schema))
6565
}
6666
}
6767

0 commit comments

Comments
 (0)