# HG changeset patch # User Tom Gottfried # Date 1532610139 -7200 # Node ID 531d1f8a2b4b9275543237e495ca1dbe322001c6 # Parent 4859aa6c96be9afd7a76b92993d95c515a90510e Fix spelling diff -r 4859aa6c96be -r 531d1f8a2b4b schema/demo-data/users.sql --- a/schema/demo-data/users.sql Thu Jul 26 13:57:08 2018 +0200 +++ b/schema/demo-data/users.sql Thu Jul 26 15:02:19 2018 +0200 @@ -5,7 +5,7 @@ -- responsibility areas from responsibility_areas.sql are imported -- Fill in Profiles -COPY users.user_profiles (username, country, email_adress, map_extent) FROM stdin; +COPY users.user_profiles (username, country, email_address, map_extent) FROM stdin; sophie AT sophie@example.com BOX(9.52115482500011 46.3786430870001,17.1483378500001 49.0097744750001) lucian RO lucian@example.com BOX(20.2428259690001 43.6500499480001,29.6995548840001 48.2748322560001) oana RO oana@example.com BOX(20.2428259690001 43.6500499480001,29.6995548840001 48.2748322560001) diff -r 4859aa6c96be -r 531d1f8a2b4b schema/gemma.sql --- a/schema/gemma.sql Thu Jul 26 13:57:08 2018 +0200 +++ b/schema/gemma.sql Thu Jul 26 15:02:19 2018 +0200 @@ -137,7 +137,7 @@ username varchar PRIMARY KEY, country char(2) NOT NULL REFERENCES responsibility_areas, map_extent box2d NOT NULL, - email_adress varchar NOT NULL UNIQUE + email_address varchar NOT NULL UNIQUE ) CREATE TABLE templates ( diff -r 4859aa6c96be -r 531d1f8a2b4b schema/manage_users.sql --- a/schema/manage_users.sql Thu Jul 26 13:57:08 2018 +0200 +++ b/schema/manage_users.sql Thu Jul 26 15:02:19 2018 +0200 @@ -9,7 +9,7 @@ pw varchar, country users.user_profiles.country%TYPE, map_extent users.user_profiles.map_extent%TYPE, - email_adress users.user_profiles.email_adress%TYPE + email_address users.user_profiles.email_address%TYPE ) RETURNS void AS $$ @@ -20,7 +20,7 @@ WHERE ra.country = create_user.country; END IF; INSERT INTO users.user_profiles VALUES ( - username, country, map_extent, email_adress); + username, country, map_extent, email_address); EXECUTE format( 'CREATE ROLE %I IN ROLE %I LOGIN PASSWORD %L', username, userrole, pw); END; @@ -36,7 +36,7 @@ new_pw varchar, new_country users.user_profiles.country%TYPE, new_map_extent users.user_profiles.map_extent%TYPE, - new_email_adress users.user_profiles.email_adress%TYPE + new_email_address users.user_profiles.email_address%TYPE ) RETURNS void AS $$ @@ -47,8 +47,8 @@ cur_username = username; UPDATE users.user_profiles p - SET (username, country, map_extent, email_adress) - = (new_username, new_country, new_map_extent, new_email_adress) + SET (username, country, map_extent, email_address) + = (new_username, new_country, new_map_extent, new_email_address) WHERE p.username = cur_username; IF new_username <> cur_username diff -r 4859aa6c96be -r 531d1f8a2b4b schema/manage_users_tests.sql --- a/schema/manage_users_tests.sql Thu Jul 26 13:57:08 2018 +0200 +++ b/schema/manage_users_tests.sql Thu Jul 26 15:02:19 2018 +0200 @@ -58,7 +58,7 @@ 'waterway_user', 'test2', 'secret', 'AT', NULL, 'xxx') $$, 23505, NULL, - 'No duplicate e-mail adress is allowed'); + 'No duplicate e-mail address is allowed'); -- -- Role update