Merge branch 'develop' into test

Makefile

@@ -114,22 +114,13 @@ sync_test_media:
 	@if [ `readlink -f .` != "/aux/akce/mam/www/mamweb-test" ]; then echo "Only possible in /akce/mam/www/mamweb-test"; exit 1; fi
 	rsync -av --delete /akce/mam/www/mamweb-prod/media/ ./media
 
-# Sync test database with production database
+# Sync (with drop) test database with production database
-sync_test_db:
-	@if [ ${USER} != "mam-web" ]; then echo "Only possible by user mam-web"; exit 1; fi
-	pg_dump mam_test > dump-test-`date +"%Y%m%d_%H%M"`.sql
-	pg_dump -Fc mam_prod > dump-prod.sql
-	pg_restore -c --if-exists -d mam_test dump-prod.sql
-	rm dump-prod.sql
-	@echo Done.
-	
-# Aggresive variant: destroy original mam_test db with 'DROP OWNED BY "mam-web";'
 sync_test_db_aggressive:
 	@if [ ${USER} != "mam-web" ]; then echo "Only possible by user mam-web"; exit 1; fi
 	pg_dump mam_test > dump-test-`date +"%Y%m%d_%H%M"`.sql
 	pg_dump -Fc mam_prod > dump-prod.sql
 	@# I am not sure which shell is used, so I am calling bash to make sure
-	bash -c "psql mam_test <<< 'DROP OWNED BY \"mam-web\";'"
+	psql mam_test -c 'DROP OWNED BY "mam-web";'
 	pg_restore -c --if-exists -d mam_test dump-prod.sql
 	rm dump-prod.sql
 	psql mam_test -c "UPDATE django_site SET name='MaMweb (test)', domain='mam-test.ks.matfyz.cz' WHERE id=1"