Skip to content

Patch4 #3

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

Closed
wants to merge 5 commits into from
Closed

Patch4 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b66b20
Add "cli" tests
pythonbrad Feb 13, 2023
47232bf
add tests
pythonbrad Feb 13, 2023
63b73e6
update
pythonbrad Feb 13, 2023
835f5c1
update
pythonbrad Feb 13, 2023
1c52fd5
update
pythonbrad Feb 13, 2023
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
46 changes: 43 additions & 3 deletions cli/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ impl Command {
},
".set" => match (params.get(1), params.get(2)) {
(Some(key), value) => Ok(Self::Set(SetOption::parse(key, value, option)?)),
(None, Some(_)) => Err(CommandError::LackOfOption),
(None, None) => Err(CommandError::LackOfOption),
(None, _) => Err(CommandError::LackOfOption),
},
".show" => match params.get(1) {
Some(key) => Ok(Self::Show(ShowOption::parse(key)?)),
Expand All @@ -156,7 +155,7 @@ mod tests {

#[test]
fn parse_command() {
use super::Command;
use super::{Command, SetOption, ShowOption};
let option = PrintOption::default();
let parse = |command| Command::parse(command, &option);

Expand Down Expand Up @@ -207,11 +206,32 @@ mod tests {
parse(".set heading off"),
Err(CommandError::WrongOption("run .set tabular OFF".into()))
);
assert_eq!(parse(".abc"), Err(CommandError::NotSupported));
assert_eq!(
parse(".set abc"),
Err(CommandError::WrongOption("abc".to_owned()))
);
assert_eq!(
parse(".set tabular abc"),
Err(CommandError::WrongOption("abc".to_owned()))
);
assert_eq!(
parse(".set tabular off"),
Ok(Command::Set(SetOption::Tabular(false)))
);
assert_eq!(
parse(".set tabular on"),
Ok(Command::Set(SetOption::Tabular(true)))
);

let mut option = PrintOption::default();
option.tabular(false);
let parse = |command| Command::parse(command, &option);

assert_eq!(
parse(".set abc false"),
Err(CommandError::WrongOption("abc".to_owned()))
);
assert_eq!(
parse(".set tabular"),
Err(CommandError::LackOfValue(
Expand All @@ -236,5 +256,25 @@ mod tests {
"Usage: .set heading {ON|OFF}".into()
))
);
assert_eq!(parse(".set"), Err(CommandError::LackOfOption));
assert_eq!(
parse(".show tabular"),
Ok(Command::Show(ShowOption::Tabular))
);
assert_eq!(parse(".show colsep"), Ok(Command::Show(ShowOption::Colsep)));
assert_eq!(
parse(".show colwrap"),
Ok(Command::Show(ShowOption::Colwrap))
);
assert_eq!(
parse(".show heading"),
Ok(Command::Show(ShowOption::Heading))
);
assert_eq!(parse(".show all"), Ok(Command::Show(ShowOption::All)));
assert_eq!(
parse(".show abc"),
Err(CommandError::WrongOption("abc".to_owned()))
);
assert_eq!(parse(".show"), Err(CommandError::LackOfOption));
}
}
127 changes: 100 additions & 27 deletions cli/src/print.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ mod tests {
use {
super::Print,
crate::command::{SetOption, ShowOption},
std::path::PathBuf,
};

#[test]
Expand Down Expand Up @@ -362,7 +363,7 @@ mod tests {

macro_rules! test {
($payload: expr, $expected: literal ) => {
print.payload($payload).unwrap();
print.payloads(&[$payload]).unwrap();

assert_eq!(
String::from_utf8(print.output.clone())
Expand All @@ -376,30 +377,30 @@ mod tests {
};
}

test!(&Payload::Create, "Table created");
test!(&Payload::DropTable, "Table dropped");
test!(&Payload::AlterTable, "Table altered");
test!(&Payload::CreateIndex, "Index created");
test!(&Payload::DropIndex, "Index dropped");
test!(&Payload::Commit, "Commit completed");
test!(&Payload::Rollback, "Rollback completed");
test!(&Payload::StartTransaction, "Transaction started");
test!(&Payload::Insert(0), "0 row inserted");
test!(&Payload::Insert(1), "1 row inserted");
test!(&Payload::Insert(7), "7 rows inserted");
test!(&Payload::Delete(300), "300 rows deleted");
test!(&Payload::Update(123), "123 rows updated");
test!(Payload::Create, "Table created");
test!(Payload::DropTable, "Table dropped");
test!(Payload::AlterTable, "Table altered");
test!(Payload::CreateIndex, "Index created");
test!(Payload::DropIndex, "Index dropped");
test!(Payload::Commit, "Commit completed");
test!(Payload::Rollback, "Rollback completed");
test!(Payload::StartTransaction, "Transaction started");
test!(Payload::Insert(0), "0 row inserted");
test!(Payload::Insert(1), "1 row inserted");
test!(Payload::Insert(7), "7 rows inserted");
test!(Payload::Delete(300), "300 rows deleted");
test!(Payload::Update(123), "123 rows updated");
test!(
&Payload::ShowVariable(PayloadVariable::Version("11.6.1989".to_owned())),
Payload::ShowVariable(PayloadVariable::Version("11.6.1989".to_owned())),
"v11.6.1989"
);
test!(
&Payload::ShowVariable(PayloadVariable::Tables(Vec::new())),
Payload::ShowVariable(PayloadVariable::Tables(Vec::new())),
"
| tables |"
);
test!(
&Payload::ShowVariable(PayloadVariable::Tables(
Payload::ShowVariable(PayloadVariable::Tables(
[
"Allocator",
"ExtendFromWithin",
Expand All @@ -421,7 +422,7 @@ mod tests {
| Splice |"
);
test!(
&Payload::Select {
Payload::Select {
labels: vec!["id".to_owned()],
rows: [101, 202, 301, 505, 1001]
.into_iter()
Expand All @@ -439,7 +440,7 @@ mod tests {
| 1001 |"
);
test!(
&Payload::Select {
Payload::Select {
labels: ["id", "title", "valid"]
.into_iter()
.map(ToOwned::to_owned)
Expand Down Expand Up @@ -483,7 +484,7 @@ mod tests {
);

test!(
&Payload::SelectMap(vec![
Payload::SelectMap(vec![
[
("id".to_owned(), Value::I64(1)),
("title".to_owned(), Value::Str("foo".to_owned()))
Expand All @@ -504,7 +505,7 @@ mod tests {
);

test!(
&Payload::ShowColumns(vec![
Payload::ShowColumns(vec![
("id".to_owned(), DataType::Int),
("name".to_owned(), DataType::Text),
("isabear".to_owned(), DataType::Boolean),
Expand All @@ -518,7 +519,7 @@ mod tests {
);

test!(
&Payload::ShowColumns(vec![
Payload::ShowColumns(vec![
("id".to_owned(), DataType::Int8),
("calc1".to_owned(), DataType::Float),
("cost".to_owned(), DataType::Decimal),
Expand Down Expand Up @@ -548,7 +549,7 @@ mod tests {
// ".set tabular OFF" should print SELECTED payload without tabular option
print.set_option(SetOption::Tabular(false));
test!(
&Payload::Select {
Payload::Select {
labels: ["id", "title", "valid"]
.into_iter()
.map(ToOwned::to_owned)
Expand All @@ -573,7 +574,7 @@ id|title|valid
);

test!(
&Payload::SelectMap(vec![
Payload::SelectMap(vec![
[
("id".to_owned(), Value::I64(1)),
("title".to_owned(), Value::Str("foo".to_owned()))
Expand All @@ -597,7 +598,7 @@ id|title
assert_eq!(print.option.format(ShowOption::Colsep), r#"colsep ",""#);

test!(
&Payload::Select {
Payload::Select {
labels: ["id", "title", "valid"]
.into_iter()
.map(ToOwned::to_owned)
Expand Down Expand Up @@ -625,7 +626,7 @@ id,title,valid
print.set_option(SetOption::Colwrap("'".into()));
assert_eq!(print.option.format(ShowOption::Colwrap), r#"colwrap "'""#);
test!(
&Payload::Select {
Payload::Select {
labels: ["id", "title", "valid"]
.into_iter()
.map(ToOwned::to_owned)
Expand All @@ -652,7 +653,7 @@ id,title,valid
// ".set header OFF should print without column name"
print.set_option(SetOption::Heading(false));
test!(
&Payload::Select {
Payload::Select {
labels: ["id", "title", "valid"]
.into_iter()
.map(ToOwned::to_owned)
Expand All @@ -675,11 +676,83 @@ id,title,valid
'2','bar','FALSE'"
);

// ".set header ON should print with column name"
print.set_option(SetOption::Heading(true));
print.set_option(SetOption::Tabular(false));
test!(
Payload::Select {
labels: ["id", "title", "valid"]
.into_iter()
.map(ToOwned::to_owned)
.collect(),
rows: vec![
vec![
Value::I64(1),
Value::Str("foo".to_owned()),
Value::Bool(true)
],
vec![
Value::I64(2),
Value::Str("bar".to_owned()),
Value::Bool(false)
],
],
},
"
'id','title','valid'
'1','foo','TRUE'
'2','bar','FALSE'"
);

print.set_option(SetOption::Heading(false));
print.set_option(SetOption::Tabular(false));
test!(
Payload::Select {
labels: ["id"]
.into_iter()
.map(ToOwned::to_owned)
.collect(),
rows: vec![
vec![
Value::I64(1),
],
vec![
Value::I64(2),
],
],
},
"'1'\n'2'"
);

// ".set tabular ON" should recover default option: colsep("|"), colwrap("")
print.set_option(SetOption::Tabular(true));
assert_eq!(print.option.format(ShowOption::Tabular), "tabular ON");
assert_eq!(print.option.format(ShowOption::Colsep), r#"colsep "|""#);
assert_eq!(print.option.format(ShowOption::Colwrap), r#"colwrap """#);
assert_eq!(print.option.format(ShowOption::Heading), "heading ON");
assert_eq!(
print.option.format(ShowOption::All),
"
tabular ON
colsep \"|\"
colwrap \"\"
heading ON"
.trim_matches('\n')
);
}

#[test]
fn print_spool() {
use std::fs;

let mut print = Print::new(Vec::new(), None, Default::default());

// Spooling on file
fs::create_dir_all("tmp").unwrap();
assert!(print.spool_on(PathBuf::from("tmp/spool.txt")).is_ok());
assert!(print.write("Test").is_ok());
assert!(print.show_option(ShowOption::All).is_ok());
print.spool_off();
assert!(print.write("Test").is_ok());
}
}