From 13eed84f57c5adaf247f94a24061ee0cb09d5785 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Mon, 14 Mar 2016 20:51:35 +1100 Subject: [PATCH 1/2] Use gen_random_uuid instead of uuid_generate_v4 --- docs/examples/users.md | 2 +- schema-templates/blog.sql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/examples/users.md b/docs/examples/users.md index 29923f491..ed2613d2b 100644 --- a/docs/examples/users.md +++ b/docs/examples/users.md @@ -224,7 +224,7 @@ begin where token_type = 'reset' and tokens.email = reset_password.email; - select uuid_generate_v4() into tok; + select gen_random_uuid() into tok; insert into basic_auth.tokens (token, token_type, email) values (tok, 'reset', reset_password.email); perform pg_notify('reset', diff --git a/schema-templates/blog.sql b/schema-templates/blog.sql index 05adffc6e..a62b9c4d1 100644 --- a/schema-templates/blog.sql +++ b/schema-templates/blog.sql @@ -97,7 +97,7 @@ basic_auth.send_validation() returns trigger declare tok uuid; begin - select uuid_generate_v4() into tok; + select gen_random_uuid() into tok; insert into basic_auth.tokens (token, token_type, email) values (tok, 'validation', new.email); perform pg_notify('validate', @@ -175,7 +175,7 @@ begin where token_type = 'reset' and tokens.email = request_password_reset.email; - select uuid_generate_v4() into tok; + select gen_random_uuid() into tok; insert into basic_auth.tokens (token, token_type, email) values (tok, 'reset', request_password_reset.email); perform pg_notify('reset', @@ -215,7 +215,7 @@ begin where token_type = 'reset' and tokens.email = reset_password.email; - select uuid_generate_v4() into tok; + select gen_random_uuid() into tok; insert into basic_auth.tokens (token, token_type, email) values (tok, 'reset', reset_password.email); perform pg_notify('reset', From 2e440822cb452f2ee6c42577fb88b00d550e1852 Mon Sep 17 00:00:00 2001 From: daurnimator Date: Mon, 14 Mar 2016 20:52:51 +1100 Subject: [PATCH 2/2] remove unnessecary create extension "uuid-ossp" --- schema-templates/blog.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/schema-templates/blog.sql b/schema-templates/blog.sql index a62b9c4d1..7d4078b59 100644 --- a/schema-templates/blog.sql +++ b/schema-templates/blog.sql @@ -11,7 +11,6 @@ create role authenticator noinherit; grant anon, author to authenticator; create extension if not exists pgcrypto; -create extension if not exists "uuid-ossp"; -- We put things inside the basic_auth schema to hide -- them from public view. Certain public procs/views will