diff --git a/server/src/server/auth/sql.gleam b/server/src/server/auth/sql.gleam index b7df8e4..5c42f77 100644 --- a/server/src/server/auth/sql.gleam +++ b/server/src/server/auth/sql.gleam @@ -40,7 +40,7 @@ select u.password_hash, u.is_active from user_account as u -where u.email = $1; +where u.email = $1::text; " |> pog.query |> pog.parameter(pog.text(arg_1)) @@ -75,7 +75,7 @@ pub fn get_role( "--  Find role assigned to an determined user select u.user_role from user_account as u -where u.id = $1; +where u.id = $1::uuid; " |> pog.query |> pog.parameter(pog.text(uuid.to_string(arg_1))) diff --git a/server/src/server/auth/sql/authenticate.sql b/server/src/server/auth/sql/authenticate.sql index 33cd21c..642ea0d 100644 --- a/server/src/server/auth/sql/authenticate.sql +++ b/server/src/server/auth/sql/authenticate.sql @@ -4,4 +4,4 @@ select u.password_hash, u.is_active from user_account as u -where u.email = $1; +where u.email = $1::text; diff --git a/server/src/server/auth/sql/get_role.sql b/server/src/server/auth/sql/get_role.sql index 14a189a..dfa3787 100644 --- a/server/src/server/auth/sql/get_role.sql +++ b/server/src/server/auth/sql/get_role.sql @@ -1,4 +1,4 @@ --  Find role assigned to an determined user select u.user_role from user_account as u -where u.id = $1; +where u.id = $1::uuid; diff --git a/server/src/server/crew/sql.gleam b/server/src/server/crew/sql.gleam index bfde10e..f6290d8 100644 --- a/server/src/server/crew/sql.gleam +++ b/server/src/server/crew/sql.gleam @@ -38,7 +38,7 @@ insert into crew_membership as cm ( crew_id, user_id ) -values ($1, unnest($2::uuid [])) +values ($1::uuid, unnest($2::uuid [])) on conflict do nothing returning cm.user_id; @@ -86,7 +86,7 @@ select c.crew_name, c.is_active from crew as c -where c.id = $1; +where c.id = $1::uuid; " |> pog.query |> pog.parameter(pog.text(uuid.to_string(arg_1))) @@ -132,7 +132,7 @@ pub fn find_members( with member as ( select cm.user_id as id from crew_membership as cm - where cm.crew_id = $1 + where cm.crew_id = $1::uuid ) select @@ -185,7 +185,7 @@ insert into crew as c ( crew_name, is_active ) -values ($1, $2, $3) +values ($1::uuid, $2::text, $3::boolean) returning c.id, c.crew_leader, c.crew_name, c.is_active; " |> pog.query diff --git a/server/src/server/crew/sql/assign_members.sql b/server/src/server/crew/sql/assign_members.sql index 26b2d7e..864b54d 100644 --- a/server/src/server/crew/sql/assign_members.sql +++ b/server/src/server/crew/sql/assign_members.sql @@ -3,7 +3,7 @@ insert into crew_membership as cm ( crew_id, user_id ) -values ($1, unnest($2::uuid [])) +values ($1::uuid, unnest($2::uuid [])) on conflict do nothing returning cm.user_id; diff --git a/server/src/server/crew/sql/find.sql b/server/src/server/crew/sql/find.sql index 4b205a5..650ee7e 100644 --- a/server/src/server/crew/sql/find.sql +++ b/server/src/server/crew/sql/find.sql @@ -5,4 +5,4 @@ select c.crew_name, c.is_active from crew as c -where c.id = $1; +where c.id = $1::uuid; diff --git a/server/src/server/crew/sql/find_members.sql b/server/src/server/crew/sql/find_members.sql index ddea935..dbe141d 100644 --- a/server/src/server/crew/sql/find_members.sql +++ b/server/src/server/crew/sql/find_members.sql @@ -2,7 +2,7 @@ with member as ( select cm.user_id as id from crew_membership as cm - where cm.crew_id = $1 + where cm.crew_id = $1::uuid ) select diff --git a/server/src/server/crew/sql/register.sql b/server/src/server/crew/sql/register.sql index e542591..b8312e3 100644 --- a/server/src/server/crew/sql/register.sql +++ b/server/src/server/crew/sql/register.sql @@ -4,5 +4,5 @@ insert into crew as c ( crew_name, is_active ) -values ($1, $2, $3) +values ($1::uuid, $2::text, $3::boolean) returning c.id, c.crew_leader, c.crew_name, c.is_active; diff --git a/server/src/server/user/sql.gleam b/server/src/server/user/sql.gleam index dc620ac..9176571 100644 --- a/server/src/server/user/sql.gleam +++ b/server/src/server/user/sql.gleam @@ -53,7 +53,7 @@ select u.phone, u.is_active from user_account as u -where u.id = $1; +where u.id = $1::uuid; " |> pog.query |> pog.parameter(pog.text(uuid.to_string(arg_1))) @@ -181,7 +181,7 @@ insert into public.user_account as u ( phone, is_active ) -values ($1, $2, $3, $4, $5, $6) +values ($1::text, $2::user_role_enum, $3::text, $4::text, $5::text, $6::boolean) returning u.id, u.full_name, u.user_role, u.email, u.phone, u.is_active; " |> pog.query diff --git a/server/src/server/user/sql/find.sql b/server/src/server/user/sql/find.sql index c703cbf..0d49dcc 100644 --- a/server/src/server/user/sql/find.sql +++ b/server/src/server/user/sql/find.sql @@ -7,4 +7,4 @@ select u.phone, u.is_active from user_account as u -where u.id = $1; +where u.id = $1::uuid; diff --git a/server/src/server/user/sql/register.sql b/server/src/server/user/sql/register.sql index b1800ab..8e4c9a1 100644 --- a/server/src/server/user/sql/register.sql +++ b/server/src/server/user/sql/register.sql @@ -7,5 +7,5 @@ insert into public.user_account as u ( phone, is_active ) -values ($1, $2, $3, $4, $5, $6) +values ($1::text, $2::user_role_enum, $3::text, $4::text, $5::text, $6::boolean) returning u.id, u.full_name, u.user_role, u.email, u.phone, u.is_active;