Skip to content

Commit f8717d3

Browse files
committed
refactor: extract test data for collections_series table into separate migrations
Pre-requsite for #1621 in order to fix integration tests Part of #1257
1 parent 9172184 commit f8717d3

File tree

4 files changed

+41
-23
lines changed

4 files changed

+41
-23
lines changed

src/main/resources/liquibase/test-data.xml

+3
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
<!-- Depends on: series_import_requests, transaction_participants -->
2020
<include file="test-data/series_sales_import_parsed_data.xml" relativeToChangelogFile="true" />
2121

22+
<!-- Depends on: collections, series -->
23+
<include file="test-data/collections_series.xml" relativeToChangelogFile="true" />
24+
2225
</databaseChangeLog>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<databaseChangeLog
3+
xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
6+
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
7+
8+
<changeSet id="add-series-to-seriesowner-collection" author="php-coder" context="test-data">
9+
10+
<comment>Adds series #1 and #3 to the collection of "seriesowner"</comment>
11+
12+
<insert tableName="collections_series">
13+
<column name="collection_id" valueComputed="(SELECT id FROM collections WHERE slug = 'seriesowner')" />
14+
<column name="series_id" valueNumeric="1" />
15+
<column name="number_of_stamps" valueNumeric="1" />
16+
<column name="added_at" valueComputed="(SELECT updated_at FROM collections WHERE slug = 'seriesowner')" />
17+
</insert>
18+
19+
<insert tableName="collections_series">
20+
<column name="collection_id" valueComputed="(SELECT id FROM collections WHERE slug = 'seriesowner')" />
21+
<column name="series_id" valueComputed="(SELECT id FROM series WHERE quantity = 3 ORDER BY id LIMIT 1)" />
22+
<column name="number_of_stamps" valueNumeric="3" />
23+
<column name="added_at" valueComputed="(SELECT updated_at FROM collections WHERE slug = 'seriesowner')" />
24+
</insert>
25+
26+
<!-- Add another instance (incomplete) of series #3 -->
27+
<insert tableName="collections_series">
28+
<column name="collection_id" valueComputed="(SELECT id FROM collections WHERE slug = 'seriesowner')" />
29+
<column name="series_id" valueComputed="(SELECT id FROM series WHERE quantity = 3 ORDER BY id LIMIT 1)" />
30+
<column name="number_of_stamps" valueNumeric="2" />
31+
<column name="added_at" valueComputed="(SELECT updated_at FROM collections WHERE slug = 'seriesowner')" />
32+
</insert>
33+
34+
</changeSet>
35+
36+
</databaseChangeLog>

src/main/resources/liquibase/version/0.4.1/2019-08-06--test_user_with_series_in_collection.xml

+2-13
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
66
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.0.xsd">
77

8-
<changeSet id="create-a-user-with-a-series-in-his-collection" author="mukeshk" context="test-data">
9-
<comment>Creates the user "seriesowner" that has series #1 and #3 in its collection</comment>
8+
<changeSet id="create-a-seriesowner-user-with-collection" author="mukeshk" context="test-data">
9+
<comment>Creates the user "seriesowner" and its collection</comment>
1010
<insert tableName="users">
1111
<column name="login" value="seriesowner" />
1212
<column name="role" value="USER" />
@@ -25,12 +25,6 @@
2525
<column name="updated_by" valueComputed="(SELECT id FROM users WHERE login = 'seriesowner')" />
2626
</insert>
2727

28-
<insert tableName="collections_series">
29-
<column name="collection_id" valueComputed="(SELECT id FROM collections WHERE slug = 'seriesowner')" />
30-
<column name="series_id" valueNumeric="1" />
31-
<column name="number_of_stamps" valueNumeric="1" />
32-
</insert>
33-
3428
<insert tableName="series">
3529
<column name="quantity" valueNumeric="3" />
3630
<column name="perforated" valueBoolean="TRUE" />
@@ -41,11 +35,6 @@
4135
<column name="updated_by" valueComputed="(SELECT id FROM users WHERE login = 'seriesowner')" />
4236
</insert>
4337

44-
<insert tableName="collections_series">
45-
<column name="collection_id" valueComputed="(SELECT id FROM collections WHERE slug = 'seriesowner')" />
46-
<column name="series_id" valueComputed="(SELECT id FROM series WHERE quantity = 3 ORDER BY id LIMIT 1)" />
47-
<column name="number_of_stamps" valueNumeric="3" />
48-
</insert>
4938
</changeSet>
5039

5140
</databaseChangeLog>

src/main/resources/liquibase/version/0.4.2/2019-11-27--add_collections_series_id.xml

-10
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,4 @@
4141

4242
</changeSet>
4343

44-
<changeSet id="add-series-3-to-collection-once-more" author="php-coder" context="test-data">
45-
46-
<insert tableName="collections_series">
47-
<column name="collection_id" valueComputed="(SELECT id FROM collections WHERE slug = 'seriesowner')" />
48-
<column name="series_id" valueComputed="(SELECT id FROM series WHERE quantity = 3 ORDER BY id LIMIT 1)" />
49-
<column name="number_of_stamps" valueNumeric="2" />
50-
</insert>
51-
52-
</changeSet>
53-
5444
</databaseChangeLog>

0 commit comments

Comments
 (0)