From 4edd3f3ffe9ebfcfd882059746d17ede030ebf22 Mon Sep 17 00:00:00 2001 From: Timothy Sehn Date: Wed, 24 Jun 2020 09:00:14 -0700 Subject: [PATCH] Added skipped test for json DATETIME bug. Also, added || false on some regexes to create deterministic behavior in old versions of bash. --- bats/sql.bats | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/bats/sql.bats b/bats/sql.bats index 34429d2e6e..1840698547 100755 --- a/bats/sql.bats +++ b/bats/sql.bats @@ -703,31 +703,38 @@ SQL EXPECTED=$( echo -e "c1\n200" ) run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" HEAD [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" two [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false EXPECTED=$( echo -e "c1\n100" ) run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" HEAD~ [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" one [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false EXPECTED=$( echo -e "c1\n0" ) run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" HEAD~2 [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false run dolt sql -r csv -q "SELECT c1 FROM one_pk WHERE pk=0" master [ $status -eq 0 ] - [[ "$output" = "$EXPECTED" ]] + [[ "$output" = "$EXPECTED" ]] || false #writes should fail if commit is specified run dolt sql -q "UPDATE one_pk SET c1 = 200 WHERE pk = 0" HEAD~ [ $status -ne 0 ] -} \ No newline at end of file +} + +@test "sql select with json output supports datetime" { + run dolt sql -r json -q "select * from has_datetimes" + [ $status -eq 0 ] + skip "DATETIME values are empty in json format right now" + [[ "$output" = "2020-02-17 00:00:00" ]] || false +}