Separated sql scripts from install.sh

jgebal · jgebal · commit ed8566fad963 · 2017-09-13T09:11:45.000+01:00
diff --git a/source/install.sh b/source/install.sh
@@ -2,17 +2,4 @@
 
 set -ev
 
-sqlplus -L -S ${DB_USER}/${DB_PASS} <<SQL
-whenever sqlerror exit failure rollback
-whenever oserror  exit failure rollback
-
-@source/award_bonus/employees_test.sql
-@source/award_bonus/award_bonus.prc
-
-@source/between_string/betwnstr.fnc
-
-@source/remove_rooms_by_name/rooms.sql
-@source/remove_rooms_by_name/remove_rooms_by_name.prc
-
-exit
-SQL
+sqlplus -L -S ${DB_USER}/${DB_PASS} @source/install.sql
diff --git a/source/install.sql b/source/install.sql
@@ -0,0 +1,12 @@
+whenever sqlerror exit failure rollback
+whenever oserror  exit failure rollback
+
+@source/award_bonus/employees_test.sql
+@source/award_bonus/award_bonus.prc
+
+@source/between_string/betwnstr.fnc
+
+@source/remove_rooms_by_name/rooms.sql
+@source/remove_rooms_by_name/remove_rooms_by_name.prc
+
+exit
diff --git a/test/install.sh b/test/install.sh
@@ -2,18 +2,4 @@
 
 set -ev
 
-sqlplus -L -S ${DB_USER}/${DB_PASS} <<SQL
-whenever sqlerror exit failure rollback
-whenever oserror  exit failure rollback
-
-@test/award_bonus/test_award_bonus.pks
-@test/award_bonus/test_award_bonus.pkb
-
-@test/between_string/test_betwnstr.pks
-@test/between_string/test_betwnstr.pkb
-
-@test/remove_rooms_by_name/test_remove_rooms_by_name.pks
-@test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
-
-exit
-SQL
+sqlplus -L -S ${DB_USER}/${DB_PASS} @test/install.sql
diff --git a/test/install.sql b/test/install.sql
@@ -0,0 +1,13 @@
+whenever sqlerror exit failure rollback
+whenever oserror  exit failure rollback
+
+@test/award_bonus/test_award_bonus.pks
+@test/award_bonus/test_award_bonus.pkb
+
+@test/between_string/test_betwnstr.pks
+@test/between_string/test_betwnstr.pkb
+
+@test/remove_rooms_by_name/test_remove_rooms_by_name.pks
+@test/remove_rooms_by_name/test_remove_rooms_by_name.pkb
+
+exit
