LPD-15796 SF

brianwulbern · Jun 18, 2024 · 2b88fe6 · 2b88fe6
1 parent bfd3325
commit 2b88fe6
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/...ion-validator-test/src/testFunctional/ant/build-test-db-partition-migration-validator.xml b/...ion-validator-test/src/testFunctional/ant/build-test-db-partition-migration-validator.xml
@@ -18,9 +18,7 @@
 	<macrodef name="modify-script-exit-code">
 		<sequential>
 			<echo append="true" file="${liferay.home}/tools/portal-tools-db-partition-migration-validator/db_partition_migration_validator.sh">
-				<![CDATA[
-exit 0
-                ]]>
+				<![CDATA[exit 0]]>
 			</echo>
 
 			<chmod
@@ -43,12 +41,12 @@ exit 0
 						<arg value="--export" />
 						<arg value="--jdbc-url" />
 						<arg value="${database.mysql.url}" />
-						<arg value="--user" />
-						<arg value="${database.mysql.username}" />
 						<arg value="--password" />
 						<arg value="${database.mysql.password}" />
 						<arg value="--schema-name" />
 						<arg value="${database.schema.name}" />
+						<arg value="--user" />
+						<arg value="${database.mysql.username}" />
 					</exec>
 				</then>
 				<else>
@@ -63,10 +61,10 @@ exit 0
 								<arg value="--export" />
 								<arg value="--jdbc-url" />
 								<arg value="jdbc:postgresql://${database.postgresql.host}/${database.schema.name}" />
-								<arg value="--user" />
-								<arg value="${database.postgresql.username}" />
 								<arg value="--password" />
 								<arg value="${database.postgresql.password}" />
+								<arg value="--user" />
+								<arg value="${database.postgresql.username}" />
 							</exec>
 						</then>
 						<else>
@@ -75,12 +73,12 @@ exit 0
 								<arg value="--export" />
 								<arg value="--jdbc-url" />
 								<arg value="${database.postgresql.url}" />
-								<arg value="--user" />
-								<arg value="${database.postgresql.username}" />
 								<arg value="--password" />
 								<arg value="${database.postgresql.password}" />
 								<arg value="--schema-name" />
 								<arg value="${database.schema.name}" />
+								<arg value="--user" />
+								<arg value="${database.postgresql.username}" />
 							</exec>
 						</else>
 					</if>
@@ -96,11 +94,11 @@ exit 0
 		<sequential>
 			<exec dir="${liferay.home}/tools/portal-tools-db-partition-migration-validator" executable="/bin/bash" failonerror="false" output="db-partition-migration-validator.log">
 				<arg value="${liferay.home}/tools/portal-tools-db-partition-migration-validator/db_partition_migration_validator.sh" />
-				<arg value="--validate" />
 				<arg value="--source-file" />
 				<arg value="${source.file.path}" />
 				<arg value="--target-file" />
 				<arg value="${target.file.path}" />
+				<arg value="--validate" />
 			</exec>
 		</sequential>
 	</macrodef>