Merge pull request #62 from QGEP/optional_roles

roles are created on demand
QGEP · Feb 2, 2018 · 611c762 · 611c762
2 parents ff3bb2d + e454c3f
commit 611c762
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ before_script:
   - psql -c 'CREATE EXTENSION hstore;' -U postgres -d qgep
 
 script:
-  - $TRAVIS_BUILD_DIR/scripts/db_setup.sh > /dev/null
+  - $TRAVIS_BUILD_DIR/scripts/db_setup.sh -r > /dev/null
   - nosetests
 
 after_success:

diff --git a/scripts/db_setup.sh b/scripts/db_setup.sh
@@ -26,11 +26,14 @@ then
   PGSERVICE=pg_qgep
 fi
 
-while getopts ":fs:p:" opt; do
+while getopts ":rfs:p:" opt; do
   case $opt in
     f)
       force=True
       ;;
+    r)
+      roles=True
+      ;;
     s)
       SRID=$OPTARG
       echo "-s was triggered, SRID: $SRID" >&2
@@ -95,4 +98,6 @@ psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -c "$(${DIR}/view/vw_oo_organisat
 psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=$SRID -f ${DIR}/view/vw_catchment_area_connections.sql
 psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -v SRID=$SRID -f ${DIR}/view/vw_change_points.sql
 
-psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/12_roles.sql
+if [[ $roles ]]; then
+  psql "service=${PGSERVICE}" -v ON_ERROR_STOP=1 -f ${DIR}/12_roles.sql
+fi