Make CI compatible for postgres DB

Signed-off-by: Christian Wolf <[email protected]>

Author: christianlupus

.github/actions/run-tests/reset-from-container.sh

@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/bash -e
 
 BACKUP="$1"
 
@@ -13,8 +13,30 @@ case "$INPUT_DB" in
 		mysql -u root -p"$MYSQL_ROOT_PASSWORD" -h mysql < "/dumps/$BACKUP/sql/dump.sql"
 		;;
 	pgsql)
+		echo 'Dropping old data'
 		PGPASSWORD="$POSTGRES_PASSWORD" \
-		psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" < "/dumps/$BACKUP/sql/dump.sql"
+		psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" -v 'ON_ERROR_STOP=1' <<- EOF || exit 1
+			DROP SCHEMA public CASCADE;
+			CREATE SCHEMA public;
+			GRANT ALL ON SCHEMA public TO $POSTGRES_USER;
+			GRANT ALL ON SCHEMA public TO public;
+			EOF
+		
+# 		PGPASSWORD="$POSTGRES_PASSWORD" \
+# 		psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" <<- EOF
+# 			\l
+# 			\d
+# 			SELECT * FROM oc_preferences WHERE appid='cookbook';
+# 			EOF
+		
+		echo 'Inserting dump data'
+		PGPASSWORD="$POSTGRES_PASSWORD" \
+		psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" -f "/dumps/$BACKUP/sql/dump.sql" -v 'ON_ERROR_STOP=1' || exit 1
+		
+# 		PGPASSWORD="$POSTGRES_PASSWORD" \
+# 		psql -d "$POSTGRES_DB" -h postgres -U "$POSTGRES_USER" <<- EOF
+# 			SELECT * FROM oc_preferences WHERE appid='cookbook';
+# 			EOF
 		;;
 	sqlite)
 		echo "Doing nothing as it was already restored during data restoration."

.github/actions/run-tests/run-locally.sh

@@ -274,10 +274,12 @@ drop_environment(){
 			fi
 			;;
 		pgsql)
-			local tables=$(echo "SELECT tablename FROM pg_tables WHERE schemaname = 'public';" | call_postgres | head -n -1 )
-			if [ -n "$tables" ]; then
-				echo "$tables" | sed 's@.*@DROP TABLE \0;@' | call_postgres
-			fi
+			call_postgres <<- EOF
+				DROP SCHEMA public CASCADE;
+				CREATE SCHEMA public;
+				GRANT ALL ON SCHEMA public TO $POSTGRES_USER;
+				GRANT ALL ON SCHEMA public TO public;
+				EOF
 			;;
 	esac
 
@@ -337,6 +339,12 @@ restore_env_dump() {
 			;;
 		pgsql)
 			echo "Restoring Postgres database from dump"
+			call_postgres <<- EOF
+				DROP SCHEMA public CASCADE;
+				CREATE SCHEMA public;
+				GRANT ALL ON SCHEMA public TO $POSTGRES_USER;
+				GRANT ALL ON SCHEMA public TO public;
+				EOF
 			cat "volumes/dumps/$ENV_DUMP_PATH/sql/dump.sql" | call_postgres
 			;;
 		sqlite)
@@ -424,7 +432,7 @@ function call_mysql() {
 
 function call_postgres() {
 	#docker-compose exec -T postgres psql -t nc_test tester
-	docker-compose exec -T postgres psql -U "$POSTGRES_USER" "$POSTGRES_DB"
+	docker-compose exec -T postgres psql -U "$POSTGRES_USER" "$POSTGRES_DB" -v 'ON_ERROR_STOP=1' --quiet "$@"
 }
 
 ##### Parameters as extracted from the CLI