Skip to content

Commit fc501e5

Browse files
markddrakemarkddrake
committed
Add RETRY option to ON_ERROR
Add RETRY option to ON_ERROR: Truncate and reload table when an error is encountred Refactor SQL Files src/install/sql/db -> src/sql/db qa/sql/db -> src/sql/db
1 parent 37c9d5d commit fc501e5

File tree

85 files changed

+1466
-4041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1466
-4041
lines changed

‎docker/rdbms/configuration/linux/configureDB2.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /database/stage
33
docker cp docker/rdbms/db2/setup %CONTAINER_NAME%:/database/stage
4-
docker cp src/install/db2/sql %CONTAINER_NAME%:/database/stage
4+
docker cp src/sql/db2/ %CONTAINER_NAME%:/database/stage
5+
docker exec -it %CONTAINER_NAME% mv /database/stage/db2 /database/stage/sql
56
docker exec -it -u db2inst1 %CONTAINER_NAME% bash /database/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configureMariaDB.bat‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
@set CONTAINER_NAME=%1
2-
docker exec -it %CONTAINER_NAME% mkdir -p /var/lib/mysql/stage/sql
2+
docker exec -it %CONTAINER_NAME% mkdir -p /var/lib/mysql/stage
33
docker cp docker/rdbms/mariadb/setup/utf-8.cnf %CONTAINER_NAME%:/etc/mysql/conf.d
4+
docker cp src/sql/mariadb/ %CONTAINER_NAME%:/var/lib/mysql/stage
5+
docker exec -it %CONTAINER_NAME% mv /var/lib/mysql/stage/mariadb /var/lib/mysql/stage/sql
46
docker cp docker/rdbms/mariadb/setup %CONTAINER_NAME%:/var/lib/mysql/stage
57
docker cp docker/rdbms/mariadb/testdata %CONTAINER_NAME%:/var/lib/mysql/stage
68
docker cp src/install/mariadb/js %CONTAINER_NAME%:/var/lib/mysql/stage
7-
docker cp qa/sql/mariadb/YADAMU_TEST.sql %CONTAINER_NAME%:/var/lib/mysql/stage/sql
89
docker exec -it -u root -w / %CONTAINER_NAME% chown -R mysql:mysql /var/lib/mysql/stage
910
docker exec -it %CONTAINER_NAME% bash /var/lib/mysql/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configureMsSQL.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /var/opt/mssql/stage
33
docker cp docker/rdbms/mssql/setup %CONTAINER_NAME%:/var/opt/mssql/stage
4+
docker cp src/sql/mssql/ %CONTAINER_NAME%:/var/opt/mssql/stage
5+
docker exec -it %CONTAINER_NAME% mv /var/opt/mssql/stage/mssql /var/opt/mssql/stage/sql
46
docker cp docker/rdbms/mssql/testdata %CONTAINER_NAME%:/var/opt/mssql/stage
5-
docker cp src/install/mssql/sql %CONTAINER_NAME%:/var/opt/mssql/stage
6-
docker cp qa/sql/mssql/YADAMU_TEST.sql %CONTAINER_NAME%:/var/opt/mssql/stage/sql
77
if "%CONTAINER_NAME%" GTR "MSSQL19" docker exec -it -u root -w / %CONTAINER_NAME% chown -R mssql:root /var/opt/mssql/stage
88
docker exec -it %CONTAINER_NAME% bash /var/opt/mssql/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configureMySQL.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /var/lib/mysql/stage
33
docker cp docker/rdbms/mysql/setup %CONTAINER_NAME%:/var/lib/mysql/stage
4+
docker cp src/sql/mysql/ %CONTAINER_NAME%:/var/lib/mysql/stage
5+
docker exec -it %CONTAINER_NAME% mv /var/lib/mysql/stage/mysql /var/lib/mysql/stage/sql
46
docker cp docker/rdbms/mysql/testdata %CONTAINER_NAME%:/var/lib/mysql/stage
5-
docker cp src/install/mysql/sql %CONTAINER_NAME%:/var/lib/mysql/stage
67
docker cp src/install/mysql/js %CONTAINER_NAME%:/var/lib/mysql/stage
7-
docker cp qa/sql/mysql/YADAMU_TEST.sql %CONTAINER_NAME%:/var/lib/mysql/stage/sql
88
docker exec -it -u root -w / %CONTAINER_NAME% chown -R mysql:mysql /var/lib/mysql/stage
99
docker exec -it %CONTAINER_NAME% bash /var/lib/mysql/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configureOracle.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /opt/oracle/oradata/stage
33
docker cp docker/rdbms/oracle/setup %CONTAINER_NAME%:/opt/oracle/oradata/stage
4+
docker cp src/sql/oracle/ %CONTAINER_NAME%:/opt/oracle/oradata/stage
5+
docker exec -it %CONTAINER_NAME% mv /opt/oracle/oradata/stage/oracle /opt/oracle/oradata/stage/sql
46
docker cp docker/rdbms/oracle/testdata %CONTAINER_NAME%:/opt/oracle/oradata/stage
5-
docker cp src/install/oracle/sql %CONTAINER_NAME%:/opt/oracle/oradata/stage
6-
docker cp qa/sql/oracle/YADAMU_TEST.sql %CONTAINER_NAME%:/opt/oracle/oradata/stage/sql
77
docker exec -it -u root -w /opt/oracle/oradata %CONTAINER_NAME% chown -R oracle:oinstall stage
88
docker exec -it -u root -w /opt/oracle/oradata %CONTAINER_NAME% chmod -R u+rwx stage
99
docker exec -it %CONTAINER_NAME% /bin/bash /opt/oracle/oradata/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configurePostgres.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /var/lib/postgresql/stage
33
docker cp docker/rdbms/postgres/setup %CONTAINER_NAME%:/var/lib/postgresql/stage
4+
docker cp src/sql/postgres %CONTAINER_NAME%:/var/lib/postgresql/stage
5+
docker exec -it %CONTAINER_NAME% mv /var/lib/postgresql/stage/postgres /var/lib/postgresql/stage/sql
46
docker cp docker/rdbms/postgres/testdata %CONTAINER_NAME%:/var/lib/postgresql/stage
5-
docker cp src/install/postgres/sql %CONTAINER_NAME%:/var/lib/postgresql/stage
6-
docker cp qa/sql/postgres/YADAMU_TEST.sql %CONTAINER_NAME%:/var/lib/postgresql/stage/sql
77
docker exec -it %CONTAINER_NAME% bash /var/lib/postgresql/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configureVertica.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /data/vertica/stage
33
docker cp docker/rdbms/vertica/setup %CONTAINER_NAME%:/data/vertica/stage
4-
docker cp src/install/vertica/sql %CONTAINER_NAME%:/data/vertica/stage
5-
docker cp qa/sql/vertica/YADAMU_TEST.sql %CONTAINER_NAME%:/data/vertica/stage/sql
4+
docker cp src/sql/vertica %CONTAINER_NAME%:/data/vertica/stage
5+
docker exec -it %CONTAINER_NAME% mv /data/vertica/stage/vertica /data/vertica/stage/sql
66
docker exec -it %CONTAINER_NAME% bash /data/vertica/stage/setup/configure.sh

‎docker/rdbms/configuration/linux/configureYugabyte.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@set CONTAINER_NAME=%1
22
docker exec -it %CONTAINER_NAME% mkdir -p /home/yugabyte/stage
33
docker cp docker/rdbms/yugabyte/setup %CONTAINER_NAME%:/home/yugabyte/stage
4-
docker cp src/install/postgres/sql %CONTAINER_NAME%:/home/yugabyte/stage
5-
docker cp qa/sql/postgres/YADAMU_TEST.sql %CONTAINER_NAME%:/home/yugabyte/stage/sql
4+
docker cp src/sql/postgres/ %CONTAINER_NAME%:/home/yugabyte/stage
5+
docker exec -it %CONTAINER_NAME% mv /home/yugabyte/stage/postgres /home/yugabyte/stage/sql
66
docker exec -it %CONTAINER_NAME% bash /home/yugabyte/stage/setup/configure.sh

‎docker/rdbms/postgres/setup/configure.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mkdir -p $STAGE/log
44
export DB_USER=postgres
55
export PGPASSWORD=oracle
66
export DB_DBNAME=yadamu
7-
psql -U $DB_USER -f setup/configure.sql > log/configure.log
7+
psql -U $DB_USER -a -e -f setup/configure.sql > log/configure.log
88
psql -U $DB_USER -d $DB_DBNAME -a -e -f sql/YADAMU_IMPORT.sql > log/YADAMU_IMPORT.log
99
psql -U $DB_USER -d $DB_DBNAME -a -e -f sql/YADAMU_TEST.sql > log/YADAMU_TEST.log
1010
psql -U $DB_USER -d $DB_DBNAME -a -e -f testdata/dataTypeTesting.sql > log/dataTypeTesting.log

‎docker/rdbms/postgres/testdata/dataTypeTesting.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ values(
821821
'fat & (rat | cat)'::tsquery
822822
);
823823
select YADAMU.AS_JSON(tsvector_col) from t_postgres.ts_search_types;
824-
select YADAMU.AS_TSVECTOR(YADAMU.AS_JSON(tsvector_col)) from t_postgres.ts_search_types;
824+
select YADAMU.AS_TS_VECTOR(YADAMU.AS_JSON(tsvector_col)) from t_postgres.ts_search_types;
825825
--
826826
-- 8.17. Range Types
827827
--

0 commit comments

Comments
 (0)