Empire mining settings
* Modified mining settings stored procedures to use text identifiers instead of numeric identifiers * Added DAO for mining settings and controller for resource operations * Added UpdateEmpireMiningSettingsCommand and associated command delegate. The command always returns NullResponse. * Overview page templates split into multiple files for clarity, added priority update form to the empire economy view and associated web server handler
This commit is contained in:
parent
92dd01ffce
commit
d38576a5cf
24 changed files with 1024 additions and 160 deletions
legacyworlds/dev-tools
61
legacyworlds/dev-tools/run-database-tests.sh
Executable file
61
legacyworlds/dev-tools/run-database-tests.sh
Executable file
|
@ -0,0 +1,61 @@
|
|||
#!/bin/sh
|
||||
|
||||
[ -z "$3" ] && {
|
||||
echo "Syntax: $0 test-database admin-user test-user [misc]" >&2
|
||||
echo
|
||||
echo "Where misc is:"
|
||||
echo " --no-create don't create the DB"
|
||||
echo " --run-name name run tests matching '*name*'"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
|
||||
test_db="$1"
|
||||
admin_user="$2"
|
||||
test_user="$3"
|
||||
|
||||
create_db=1
|
||||
run_name=""
|
||||
while ! [ -z "$4" ]; do
|
||||
if [ "x$4" = "x--no-create" ]; then
|
||||
create_db=0
|
||||
elif [ "x$4" = "x--run-name" ]; then
|
||||
shift
|
||||
run_name="$4"
|
||||
fi
|
||||
|
||||
shift
|
||||
done
|
||||
|
||||
scriptdir="`dirname $0`"
|
||||
tempdir="`mktemp -d`"
|
||||
cp -Rap $scriptdir/../../legacyworlds-server-data/db-structure/* $tempdir/
|
||||
cat > $tempdir/db-config.txt <<EOF
|
||||
admin=$admin_user
|
||||
db=$test_db
|
||||
user=$test_user
|
||||
password=$test_user
|
||||
EOF
|
||||
|
||||
(
|
||||
cd $tempdir
|
||||
|
||||
if [ $create_db -eq 1 ]; then
|
||||
echo "Creating DB..."
|
||||
psql -vQUIET=1 -vON_ERROR_STOP=1 --file database.sql || exit 1
|
||||
psql -vQUIET=1 -f tests/pgtap.sql $test_db || exit 1
|
||||
fi
|
||||
|
||||
cd tests
|
||||
if [ "x$run_name" = "x" ]; then
|
||||
run_name='*.sql'
|
||||
else
|
||||
run_name='*'"$run_name"'*'
|
||||
fi
|
||||
pg_prove -d $test_db `find admin/ -type f -name "$run_name" | sort` || exit 1
|
||||
pg_prove -U $test_user -d $test_db `find user/ -type f -name "$run_name" | sort` || exit 1
|
||||
)
|
||||
result=$?
|
||||
|
||||
rm -rf $tempdir
|
||||
exit $result
|
Reference in a new issue