Skip to content

Commit f8e5897

Browse files
committed
fix: finally fix duplicate key violations on PostgreSQL.
Corrections for 2cf786b and 797a9a7 commits. Addressed to #1034
1 parent 03f6755 commit f8e5897

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/main/resources/liquibase/sql/test-user-admin.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
-- Auto-generated by Maven, based on values from src/main/resources/test/spring/test-data.properties
33
--
44

5-
INSERT INTO users(id, login, role, name, registered_at, activated_at, hash, salt, email) VALUES
6-
(2, '@valid_admin_login@', 'ADMIN', 'Site Admin', NOW(), NOW(), '@old_valid_admin_password_hash@', '@old_valid_admin_password_salt@', 'admin@localhost');
5+
INSERT INTO users(login, role, name, registered_at, activated_at, hash, salt, email) VALUES
6+
('@valid_admin_login@', 'ADMIN', 'Site Admin', NOW(), NOW(), '@old_valid_admin_password_hash@', '@old_valid_admin_password_salt@', 'admin@localhost');

src/main/resources/liquibase/version/0.3/2014-02-11--categories.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
<column name="name" value="Prehistoric animals" />
4242
<column name="name_ru" value="Доисторические животные" />
4343
<column name="created_at" valueComputed="${NOW}" />
44-
<column name="created_by" value="2" /><!-- it's admin -->
44+
<column name="created_by" valueComputed="(SELECT id FROM users WHERE role = 'ADMIN' ORDER by id LIMIT 1)" />
4545
<column name="updated_at" valueComputed="${NOW}" />
46-
<column name="updated_by" value="2" /><!-- it's admin -->
46+
<column name="updated_by" valueComputed="(SELECT id FROM users WHERE role = 'ADMIN' ORDER by id LIMIT 1)" />
4747
</insert>
4848
</changeSet>
4949

src/main/resources/liquibase/version/0.4/2017-11-08--import_series.xml

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
<changeSet id="add-another-test-series" author="php-coder" context="test-data">
135135

136136
<insert tableName="series">
137-
<column name="id" valueNumeric="2" />
138137
<column name="quantity" valueNumeric="3" />
139138
<column name="perforated" valueBoolean="false" />
140139
<column name="category_id" valueNumeric="1" />

0 commit comments

Comments
 (0)