diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2019-02-28 12:29:56 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2019-02-28 12:29:56 +0300 |
| commit | 766eed0074665d7544ffb100aa1bede6fbee6fdd (patch) | |
| tree | d20adf998a73eb862730839aebc2b347cd892aba /build.xml | |
| parent | 1fd1db3bec150e3d6201cdb521191fa63c8a49e1 (diff) | |
.......... [DEV-949] updated ANT script to create proxy database; replaced dash by underscore in proxy database
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 66 |
1 files changed, 58 insertions, 8 deletions
diff --git a/build.xml b/build.xml index 9cfaef1c0e4..45824cb21b8 100644 --- a/build.xml +++ b/build.xml @@ -73,7 +73,7 @@ </exec> </target> - <target name="init-postgresql" depends=""> + <target name="init-server-postgresql" depends=""> <!-- Create PostgreSQL database --> <exec executable="psql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> @@ -117,7 +117,35 @@ </exec> </target> - <target name="init-frontend-postgresql" depends="create-configs,make-dbschema,init-postgresql"> + <target name="init-proxy-postgresql" depends=""> + <!-- Create PostgreSQL database --> + <exec executable="psql" failonerror="on"> + <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-h '${dbhost}'"/> + <arg line="-U '${dbuser}'"/> + <arg line="-1"/> + <arg line="--set ON_ERROR_STOP=1"/> + <arg line="-c 'drop database if exists ${dbname}_proxy'"/> + </exec> + <exec executable="psql" failonerror="on"> + <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-h '${dbhost}'"/> + <arg line="-U '${dbuser}'"/> + <arg line="-1"/> + <arg line="--set ON_ERROR_STOP=1"/> + <arg line="-c 'create database ${dbname}_proxy'"/> + </exec> + <exec executable="psql" input="database/postgresql/schema.sql" failonerror="on"> + <env key="PGPASSWORD" value="${dbpassword}"/> + <arg line="-h '${dbhost}'"/> + <arg line="-U '${dbuser}'"/> + <arg line="-1"/> + <arg line="--set ON_ERROR_STOP=1"/> + <arg line="${dbname}_proxy"/> + </exec> + </target> + + <target name="init-frontend-postgresql" depends="create-configs,make-dbschema,init-server-postgresql"> <exec executable="psql" input="frontends/php/tests/selenium/data/data_test.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> <arg line="-h '${dbhost}'"/> @@ -128,7 +156,7 @@ </exec> </target> - <target name="init-api-postgresql" depends="create-configs,make-dbschema,init-postgresql"> + <target name="init-api-postgresql" depends="create-configs,make-dbschema,init-server-postgresql"> <exec executable="psql" input="frontends/php/tests/api_json/data/data_test.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> <arg line="-h '${dbhost}'"/> @@ -139,7 +167,7 @@ </exec> </target> - <target name="init-integration-postgresql" depends="create-configs,make-binaries-postgresql,init-postgresql"> + <target name="init-integration-postgresql" depends="create-configs,make-binaries-postgresql,init-server-postgresql,init-proxy-postgresql"> <exec executable="psql" input="frontends/php/tests/integration/data/data_test.sql" failonerror="on"> <env key="PGPASSWORD" value="${dbpassword}"/> <arg line="-h '${dbhost}'"/> @@ -171,7 +199,7 @@ </exec> </target> - <target name="init-mysql" depends=""> + <target name="init-server-mysql" depends=""> <!-- Create MySQL database --> <exec executable="mysql" failonerror="on"> <arg line="--host=${dbhost}"/> @@ -205,7 +233,29 @@ </exec> </target> - <target name="init-frontend-mysql" depends="create-configs,make-dbschema,init-mysql"> + <target name="init-proxy-mysql" depends=""> + <!-- Create MySQL database --> + <exec executable="mysql" failonerror="on"> + <arg line="--host=${dbhost}"/> + <arg line="--user=${dbuser}"/> + <arg line="--password=${dbpassword}"/> + <arg line="--execute='drop database if exists ${dbname}_proxy'"/> + </exec> + <exec executable="mysql" failonerror="on"> + <arg line="--host=${dbhost}"/> + <arg line="--user=${dbuser}"/> + <arg line="--password=${dbpassword}"/> + <arg line="--execute='create database ${dbname}_proxy character set utf8 collate utf8_bin'"/> + </exec> + <exec executable="mysql" input="database/mysql/schema.sql" failonerror="on"> + <arg line="--host=${dbhost}"/> + <arg line="--user=${dbuser}"/> + <arg line="--password=${dbpassword}"/> + <arg line="${dbname}_proxy"/> + </exec> + </target> + + <target name="init-frontend-mysql" depends="create-configs,make-dbschema,init-server-mysql"> <exec executable="mysql" input="frontends/php/tests/selenium/data/data_test.sql" failonerror="on"> <arg line="--host=${dbhost}"/> <arg line="--user=${dbuser}"/> @@ -214,7 +264,7 @@ </exec> </target> - <target name="init-api-mysql" depends="create-configs,make-dbschema,init-mysql"> + <target name="init-api-mysql" depends="create-configs,make-dbschema,init-server-mysql"> <exec executable="mysql" input="frontends/php/tests/api_json/data/data_test.sql" failonerror="on"> <arg line="--host=${dbhost}"/> <arg line="--user=${dbuser}"/> @@ -223,7 +273,7 @@ </exec> </target> - <target name="init-integration-mysql" depends="create-configs,make-binaries-mysql,init-mysql"> + <target name="init-integration-mysql" depends="create-configs,make-binaries-mysql,init-server-mysql,init-proxy-mysql"> <exec executable="mysql" input="frontends/php/tests/integration/data/data_test.sql" failonerror="on"> <arg line="--host=${dbhost}"/> <arg line="--user=${dbuser}"/> |