|
21 | 21 |
|
22 | 22 | <target name="set.database.name.variables"> |
23 | 23 | <property name="run.tSQLt.database" value="${db.name}" /> |
24 | | - <property name="run.Dacpac.database" value="${db.name}_dacpac" /> |
| 24 | + <property name="run.Dacpac.src.database" value="${db.name}_dacpac_src" /> |
| 25 | + <property name="run.Dacpac.validate.database" value="${db.name}_dacpac_tgt" /> |
25 | 26 | <property name="run.Facade.database" value="${db.name}_facade" /> |
26 | 27 | <property name="run.Example.database" value="tSQLt_Example" /> <!-- do not change, hard coded in deployment --> |
27 | 28 |
|
28 | 29 | <property name="run.Facade.src.database" value="${run.Facade.database}_src" /> |
29 | | - <property name="run.Facade.trg.database" value="${run.Facade.database}_trg" /> |
| 30 | + <property name="run.Facade.tgt.database" value="${run.Facade.database}_tgt" /> |
30 | 31 | <property name="run.Facade.validate.database" value="${run.Facade.database}_validate" /> |
31 | | - <echo message="Selected Dacpac Database: [${run.Dacpac.database}]" /> |
| 32 | + |
| 33 | + <echo message="Selected tSQLt Database: [${run.tSQLt.database}]" /> |
| 34 | + |
| 35 | + <echo message="Selected Dacpac Src Database: [${run.Dacpac.src.database}]" /> |
| 36 | + <echo message="Selected Dacpac Validate Database: [${run.Dacpac.validate.database}]" /> |
| 37 | + |
| 38 | + <echo message="Selected Facade Database Prefix: [${run.Facade.database}]" /> |
| 39 | + <echo message="Selected Facade Src Database: [${run.Facade.src.database}]" /> |
| 40 | + <echo message="Selected Facade Tgt Database: [${run.Facade.tgt.database}]" /> |
| 41 | + <echo message="Selected Facade Validate Database: [${run.Facade.validate.database}]" /> |
| 42 | + |
| 43 | + <echo message="Selected Example Database: [${run.Example.database}]" /> |
| 44 | + |
32 | 45 | </target> |
33 | 46 |
|
34 | 47 | <target name="run.all" depends="set.database.name.variables, Preparation"> |
35 | 48 | <antcall target="deployAndValidate.tSQLt"> |
36 | 49 | <param name="deployAndValidate.tSQLt.database" value="${run.tSQLt.database}" /> |
37 | 50 | </antcall> |
38 | 51 | <antcall target="deployAndValidate.Dacpac"> |
39 | | - <param name="deployAndValidate.Dacpac.database" value="${run.Dacpac.database}" /> |
| 52 | + <param name="deployAndValidate.Dacpac.database" value="${run.Dacpac.validate.database}" /> |
40 | 53 | </antcall> |
41 | 54 | <antcall target="deployAndValidate.Facade"> |
42 | 55 | <param name="deployAndValidate.Facade.database" value="${run.Facade.database}" /> |
|
74 | 87 | </antcall> |
75 | 88 | </target> |
76 | 89 | <target name="run.DacpacOnly" depends="set.database.name.variables, Preparation"> |
77 | | - <echo message="Selected Database: [${run.Dacpac.database}]" /> |
| 90 | + <echo message="Selected Database: [${run.Dacpac.validate.database}]" /> |
78 | 91 | <antcall target="deployAndValidate.Dacpac"> |
79 | | - <param name="deployAndValidate.Dacpac.database" value="${run.Dacpac.database}" /> |
| 92 | + <param name="deployAndValidate.Dacpac.database" value="${run.Dacpac.validate.database}" /> |
80 | 93 | </antcall> |
81 | 94 | <antcall target="process.testresults"> |
82 | | - <param name="process.testresults.database" value="${run.Dacpac.database}" /> |
| 95 | + <param name="process.testresults.database" value="${run.Dacpac.validate.database}" /> |
83 | 96 | <param name="process.testresults.FileList" value="TestResults_tSQLtDacpac.xml;testresults_tSQLtDacpac_external_access_key_exists.xml;testresults_tSQLtDacpac_external_access.xml;testresults_tSQLtDacpac_sa.xml;TestResults_tSQLtDacpac_TestUtil.xml;" /> |
84 | 97 | </antcall> |
85 | 98 | </target> |
|
0 commit comments