Skip to content

Commit

Permalink
refactor(globbing): make it unambiguous
Browse files Browse the repository at this point in the history
  • Loading branch information
SpokeyWheeler committed Jan 21, 2021
1 parent 091fa29 commit e730869
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,34 +115,34 @@ myruntests() {
exptot=900
expa=0

./batcher update -concurrency 4 -database batchertestdb -dbtype mysql -host $host -opts $opts -password $password -portnum $portnum -table serialtest -set "strcol='b'" -user $user -where "strcol='a'" -execute
./batcher update -concurrency 4 -database batchertestdb -dbtype mysql -host "$host" -opts "$opts" -password "$password" -portnum "$portnum" -table serialtest -set "strcol='b'" -user "$user" -where "strcol='a'" -execute

sera=$( $SQLCMD "SET CHARACTER SET 'utf8'; SET NAMES 'utf8' COLLATE 'utf8_general_ci'; SELECT COUNT(*) FROM serialtest WHERE strcol = 'a';" 2> /dev/null | grep -iv count | grep -iv row )
comp "Updated serial a" "$expa" "$sera"

./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host $host -opts $opts -password $password -portnum $portnum -table serialtest -user $user -where "intcol<101" -execute
./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host "$host" -opts "$opts" -password "$password" -portnum "$portnum" -table serialtest -user "$user" -where "intcol<101" -execute

sertot=$( $SQLCMD "SET CHARACTER SET 'utf8'; SET NAMES 'utf8' COLLATE 'utf8_general_ci'; SELECT COUNT(*) FROM serialtest;" 2> /dev/null | grep -iv count | grep -iv row )
comp "Small delete serial total" "$exptot" "$sertot"

./batcher update -concurrency 4 -database batchertestdb -dbtype mysql -host $host -opts $opts -password $password -portnum $portnum -set "strcol='b'" -table compositetest -user $user -where "strcol='a'" -execute
./batcher update -concurrency 4 -database batchertestdb -dbtype mysql -host "$host" -opts "$opts" -password "$password" -portnum "$portnum" -set "strcol='b'" -table compositetest -user "$user" -where "strcol='a'" -execute

cmpa=$( $SQLCMD "SET CHARACTER SET 'utf8'; SET NAMES 'utf8' COLLATE 'utf8_general_ci'; SELECT COUNT(*) FROM compositetest WHERE strcol = 'a';" 2> /dev/null | grep -iv count | grep -iv row )
comp "Updated composite a" "$expa" "$cmpa"

./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host $host -opts $opts -password $password -portnum $portnum -table compositetest -user $user -where "intcol<101" -execute
./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host "$host" -opts "$opts" -password "$password" -portnum "$portnum" -table compositetest -user "$user" -where "intcol<101" -execute

cmptot=$( $SQLCMD "SET CHARACTER SET 'utf8'; SET NAMES 'utf8' COLLATE 'utf8_general_ci'; SELECT COUNT(*) FROM compositetest;" 2> /dev/null | grep -iv count | grep -iv row )
comp "Small delete composite total" "$exptot" "$cmptot"

exptot=0

./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host $host -opts $opts -password $password -portnum $portnum -table serialtest -user $user -where "1=1" -execute
./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host "$host" -opts "$opts" -password "$password" -portnum "$portnum" -table serialtest -user "$user" -where "1=1" -execute

sertot=$( $SQLCMD "SET CHARACTER SET 'utf8'; SET NAMES 'utf8' COLLATE 'utf8_general_ci'; SELECT COUNT(*) FROM serialtest;" 2> /dev/null | grep -iv count | grep -iv row )
comp "Full delete serial total" "$exptot" "$sertot"

./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host $host -opts $opts -password $password -portnum $portnum -table compositetest -user $user -where "1=1" -execute
./batcher delete -concurrency 4 -database batchertestdb -dbtype mysql -host "$host" -opts "$opts" -password "$password" -portnum "$portnum" -table compositetest -user "$user" -where "1=1" -execute

cmptot=$( $SQLCMD "SET CHARACTER SET 'utf8'; SET NAMES 'utf8' COLLATE 'utf8_general_ci'; SELECT COUNT(*) FROM compositetest;" 2> /dev/null | grep -iv count | grep -iv row )
comp "Full delete composite total" "$exptot" "$cmptot"
Expand Down

0 comments on commit e730869

Please sign in to comment.