Skip to content

Commit 797a9a7

Browse files
committed
fix(users): use autogenerated ids to prevent duplicate key violations on insertion later.
See cdb000e commit for details. Addressed to #1034
1 parent 2cf786b commit 797a9a7

File tree

4 files changed

+24
-10
lines changed

4 files changed

+24
-10
lines changed

src/main/resources/liquibase/sql/test-country-italy.sql

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@
33
--
44

55
-- Used below as country's owner
6-
INSERT INTO users(id, login, role, name, registered_at, activated_at, hash, salt, email) VALUES
7-
(3, 'test0', 'USER', 'Italy Country Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
6+
INSERT INTO users(login, role, name, registered_at, activated_at, hash, salt, email) VALUES
7+
('test0', 'USER', 'Italy Country Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
88

99
-- Used at least by src/test/robotframework/country/creation/validation.robot
1010
INSERT INTO countries(name, created_at, created_by, updated_at, updated_by) VALUES
11-
('Italy', NOW(), 3, NOW(), 3);
11+
(
12+
'Italy',
13+
NOW(),
14+
(SELECT id FROM users WHERE login = 'test0'),
15+
NOW(),
16+
(SELECT id FROM users WHERE login = 'test0')
17+
);

src/main/resources/liquibase/sql/test-series-with-catalogs-numbers.sql

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,21 @@
33
--
44

55
-- Used below as series' owner
6-
INSERT INTO users(id, login, role, name, registered_at, activated_at, hash, salt, email) VALUES
7-
(4, 'test1', 'USER', 'Series Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
6+
INSERT INTO users(login, role, name, registered_at, activated_at, hash, salt, email) VALUES
7+
('test1', 'USER', 'Series Owner', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
88

99
-- Used only in src/test/robotframework/series/creation/misc-user.robot
1010
INSERT INTO images(type) VALUES('PNG');
1111
INSERT INTO series(quantity, perforated, image_url, created_at, created_by, updated_at, updated_by) VALUES
12-
(1, TRUE, '/image/1', NOW(), 4, NOW(), 4);
12+
(
13+
1,
14+
TRUE,
15+
'/image/1',
16+
NOW(),
17+
(SELECT id FROM users WHERE login = 'test1'),
18+
NOW(),
19+
(SELECT id FROM users WHERE login = 'test1')
20+
);
1321

1422
INSERT INTO michel_catalog(code) VALUES('99');
1523
INSERT INTO series_michel_catalog(series_id, michel_id) SELECT 1, id FROM michel_catalog WHERE code = '99';

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

Lines changed: 2 additions & 2 deletions
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-
(1, '@valid_user_login@', 'USER', '@valid_user_name@', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');
5+
INSERT INTO users(login, role, name, registered_at, activated_at, hash, salt, email) VALUES
6+
('@valid_user_login@', 'USER', '@valid_user_name@', NOW(), NOW(), '@old_valid_user_password_hash@', '@old_valid_user_password_salt@', '[email protected]');

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
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, email) VALUES
6-
(5, 'paid', 'PAID', 'Paid User', NOW(), NOW(), '$2a$10$8Rxlvw8r7r7a.w5rxOJYY.XbBE71ivvGjlnE6w/G73A58l1I76VRK' /* test */, '[email protected]');
5+
INSERT INTO users(login, role, name, registered_at, activated_at, hash, email) VALUES
6+
('paid', 'PAID', 'Paid User', NOW(), NOW(), '$2a$10$8Rxlvw8r7r7a.w5rxOJYY.XbBE71ivvGjlnE6w/G73A58l1I76VRK' /* test */, '[email protected]');
77

88
INSERT INTO collections(user_id, slug, updated_at, updated_by) VALUES
99
(

0 commit comments

Comments
 (0)