Skip to content

Commit

Permalink
Merge pull request #32 from ludwigschubert/master
Browse files Browse the repository at this point in the history
Always quote variable names in SQL for sqlite to support input/output names such as "commit"
  • Loading branch information
netj committed Dec 8, 2015
2 parents d8200b5 + 2ef6586 commit 31323c5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions gui/.module.build
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ dir_pypkgs=python-packages
echo >&2 "Bundling python packages"
mkdir -p -- "$dir_pypkgs"
[ -s get-pip.py ] ||
curl -sRLO https://raw.github.com/pypa/pip/master/contrib/get-pip.py
curl -sRLO https://github.com/pypa/pip/raw/master/contrib/get-pip.py
case $(uname) in
Darwin)
# XXX workaround for incompatibility introduced by Xcode 5.1
Expand All @@ -90,7 +90,7 @@ dir_pypkgs=python-packages
export ARCHFLAGS="${ARCHFLAGS:-} -Wno-error=unused-command-line-argument-hard-error-in-future"
;;
esac
python get-pip.py \
/usr/bin/python get-pip.py \
--target "$dir_pypkgs" --ignore-installed "${pypkgs[@]}"
PYTHONPATH="$dir_pypkgs" \
python -m pip uninstall -y pip || true
Expand Down
2 changes: 1 addition & 1 deletion gui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"jade": "0.28.1",
"marked": "0.2.8",
"moment": "1.7.2",
"time": "0.8.3",
"time": "0.11.4",
"underscore": "1.4.2"
}
}
2 changes: 1 addition & 1 deletion results/3x-index
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ case $Cmd in
query.json)
cols="id AS 'run#'" #header="run#"
for varName in $columns; do
cols+=", _$varName AS $varName" #header+="\t$varName"
cols+=", _$varName AS \"$varName\"" #header+="\t$varName"
done
# compile selection expression from arguments
where=$(compile-where "$@")
Expand Down
2 changes: 1 addition & 1 deletion runner/queue
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ case $Cmd in
list.json)
cols="state AS 'state#'"
for varName in $inputs; do
cols+=", _$varName AS $varName"
cols+=", _$varName AS \"$varName\""
done
cols+=", serial AS 'serial#'"
cols+=", target AS 'target#'"
Expand Down

0 comments on commit 31323c5

Please sign in to comment.