Skip to content

Commit 522a191

Browse files
committed
Merge pull request #470 from Breeding-Insight/bug/BI-2664
BI-2664 - Add missing Honey Bee entry to species migration
1 parent 75dca96 commit 522a191

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/main/resources/brapi/sql/R__species.sql

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@ SELECT
3030
-- 1) lower‑case
3131
-- 2) trim leading/trailing space
3232
-- 3) REMOVE every space or tab
33-
regexp_replace(lower(trim(crop_name)), '\s', '', 'g')),
34-
v_auth_id,
35-
crop_name
33+
regexp_replace(lower(trim(crop_name)), '\s', '', 'g')),
34+
v_auth_id,
35+
crop_name
3636
FROM (VALUES
37-
('Blueberry'), ('Salmon'), ('Grape'), ('Alfalfa'),
38-
('Sweet Potato'), ('Trout'), ('Soybean'), ('Cranberry'),
39-
('Cucumber'), ('Oat'), ('Citrus'), ('Sugar Cane'),
40-
('Strawberry'), ('Pecan'), ('Lettuce'), ('Cotton'),
41-
('Sorghum'), ('Hemp'), ('Hop'), ('Hydrangea'),
42-
('Red Clover'), ('Potato'), ('Blackberry'), ('Raspberry'),
43-
('Sugar Beet'), ('Coffee')
37+
('Blueberry'), ('Salmon'), ('Grape'), ('Alfalfa'),
38+
('Sweet Potato'), ('Trout'), ('Soybean'), ('Cranberry'),
39+
('Cucumber'), ('Oat'), ('Citrus'), ('Sugar Cane'),
40+
('Strawberry'), ('Honey Bee'), ('Pecan'), ('Lettuce'),
41+
('Cotton'), ('Sorghum'), ('Hemp'), ('Hop'),
42+
('Hydrangea'), ('Red Clover'), ('Potato'), ('Blackberry'),
43+
('Raspberry'), ('Sugar Beet'), ('Coffee')
4444
) AS src(crop_name)
4545
ON CONFLICT (id) DO
4646
-- want case changes or space changes to overwrite existing

src/test/resources/sql/brapi/species.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ FROM (VALUES
3333
('Blueberry'), ('Salmon'), ('Grape'), ('Alfalfa'),
3434
('Sweet Potato'), ('Trout'), ('Soybean'), ('Cranberry'),
3535
('Cucumber'), ('Oat'), ('Citrus'), ('Sugar Cane'),
36-
('Strawberry'), ('Pecan'), ('Lettuce'), ('Cotton'),
37-
('Sorghum'), ('Hemp'), ('Hop'), ('Hydrangea'),
38-
('Red Clover'), ('Potato'), ('Blackberry'), ('Raspberry'),
39-
('Sugar Beet'), ('Coffee')
36+
('Strawberry'), ('Honey Bee'), ('Pecan'), ('Lettuce'),
37+
('Cotton'), ('Sorghum'), ('Hemp'), ('Hop'),
38+
('Hydrangea'), ('Red Clover'), ('Potato'), ('Blackberry'),
39+
('Raspberry'), ('Sugar Beet'), ('Coffee')
4040
) AS src(crop_name)
4141
ON CONFLICT (id) DO
4242
UPDATE SET crop_name = EXCLUDED.crop_name

0 commit comments

Comments
 (0)