Skip to content

fix: don't panic anymore when there is no column value matching in insert into #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fabriceclementz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: don't panic anymore when there is no column value matching in insert into #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 36 additions & 34 deletions replibyte/src/source/mysql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,42 +199,44 @@ fn transform_columns(
let mut columns = vec![];

for (i, column_name) in column_names.iter().enumerate() {
let value_token = column_values.get(i).unwrap();

let column = match value_token {
Token::Number(column_value, _) => {
if column_value.contains(".") {
Column::FloatNumberValue(
column_name.to_string(),
column_value.parse::<f64>().unwrap(),
)
} else {
Column::NumberValue(
column_name.to_string(),
column_value.parse::<i128>().unwrap(),
)
let column = if let Some(value_token) = column_values.get(i) {
match value_token {
Token::Number(column_value, _) => {
if column_value.contains(".") {
Column::FloatNumberValue(
column_name.to_string(),
column_value.parse::<f64>().unwrap(),
)
} else {
Column::NumberValue(
column_name.to_string(),
column_value.parse::<i128>().unwrap(),
)
}
}
Token::Char(column_value) => {
Column::CharValue(column_name.to_string(), column_value.clone())
}
Token::SingleQuotedString(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::NationalStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::HexStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::Word(w)
if (w.value == "true" || w.value == "false")
&& w.quote_style == None
&& w.keyword == NoKeyword =>
{
Column::BooleanValue(column_name.to_string(), w.value.parse::<bool>().unwrap())
}
_ => Column::None(column_name.to_string()),
}
Token::Char(column_value) => {
Column::CharValue(column_name.to_string(), column_value.clone())
}
Token::SingleQuotedString(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::NationalStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::HexStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::Word(w)
if (w.value == "true" || w.value == "false")
&& w.quote_style == None
&& w.keyword == NoKeyword =>
{
Column::BooleanValue(column_name.to_string(), w.value.parse::<bool>().unwrap())
}
_ => Column::None(column_name.to_string()),
} else {
Column::None(column_name.to_string())
};

// get the right transformer for the right column name
Expand Down
70 changes: 36 additions & 34 deletions replibyte/src/source/postgres.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,42 +286,44 @@ fn transform_columns(
let mut columns = vec![];

for (i, column_name) in column_names.iter().enumerate() {
let value_token = column_values.get(i).unwrap();

let column = match value_token {
Token::Number(column_value, _) => {
if column_value.contains(".") {
Column::FloatNumberValue(
column_name.to_string(),
column_value.parse::<f64>().unwrap(),
)
} else {
Column::NumberValue(
column_name.to_string(),
column_value.parse::<i128>().unwrap(),
)
let column = if let Some(value_token) = column_values.get(i) {
match value_token {
Token::Number(column_value, _) => {
if column_value.contains(".") {
Column::FloatNumberValue(
column_name.to_string(),
column_value.parse::<f64>().unwrap(),
)
} else {
Column::NumberValue(
column_name.to_string(),
column_value.parse::<i128>().unwrap(),
)
}
}
Token::Char(column_value) => {
Column::CharValue(column_name.to_string(), column_value.clone())
}
Token::SingleQuotedString(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::NationalStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::HexStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::Word(w)
if (w.value == "true" || w.value == "false")
&& w.quote_style == None
&& w.keyword == NoKeyword =>
{
Column::BooleanValue(column_name.to_string(), w.value.parse::<bool>().unwrap())
}
_ => Column::None(column_name.to_string()),
}
Token::Char(column_value) => {
Column::CharValue(column_name.to_string(), column_value.clone())
}
Token::SingleQuotedString(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::NationalStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::HexStringLiteral(column_value) => {
Column::StringValue(column_name.to_string(), column_value.clone())
}
Token::Word(w)
if (w.value == "true" || w.value == "false")
&& w.quote_style == None
&& w.keyword == NoKeyword =>
{
Column::BooleanValue(column_name.to_string(), w.value.parse::<bool>().unwrap())
}
_ => Column::None(column_name.to_string()),
} else {
Column::None(column_name.to_string())
};

// get the right transformer for the right column name
Expand Down