prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: enhance user creation logic in setup.sh for conflict resolution

Browse source 
- Updated the user creation logic in setup.sh to handle conflicts more effectively. The script now updates the user's name and password if a conflict occurs on the email field, and similarly updates the user_id for conflicts on the username field.

This change improves the robustness of user management by ensuring that existing user data is updated rather than ignored during the creation process.
This commit is contained in:
Rohit Amarnath 2025-09-23 13:43:44 -04:00
parent ae35af1a0d
commit e48ba9c209
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
packages/db/setup.sh
View file

@ -44,10 +44,15 @@ if [ -f "$USERS_FILE" ] && [ -z "${NO_DEMO_USER}" ]; then
psql --host $PG_HOST --username $POSTGRES_USER --dbname $PG_DB --command \
"INSERT INTO omnivore.user (id, source, email, source_user_id, name, password)
VALUES ('$USER_ID', 'EMAIL', '$email', '$email', '$name', '$PASSWORD_HASH')
ON CONFLICT(email) DO NOTHING;
ON CONFLICT (email) DO UPDATE SET
name = EXCLUDED.name,
password = EXCLUDED.password;
INSERT INTO omnivore.user_profile (user_id, username)
VALUES ('$USER_ID', '$username')
ON CONFLICT(user_id) DO NOTHING;" || true
SELECT omnivore.user.id, '$username'
FROM omnivore.user
WHERE email = '$email'
ON CONFLICT (username) DO UPDATE SET
user_id = EXCLUDED.user_id;" || true
echo "Created user: $email"
done
@ -73,10 +78,15 @@ elif [ -z "${NO_DEMO_USER}" ]; then
psql --host $PG_HOST --username $POSTGRES_USER --dbname $PG_DB --command \
"INSERT INTO omnivore.user (id, source, email, source_user_id, name, password)
VALUES ('$USER_ID', 'EMAIL', '$DEMO_EMAIL', '$DEMO_EMAIL', '$DEMO_NAME', '$DEMO_PASSWORD_HASH')
ON CONFLICT(email) DO NOTHING;
ON CONFLICT (email) DO UPDATE SET
name = EXCLUDED.name,
password = EXCLUDED.password;
INSERT INTO omnivore.user_profile (user_id, username)
VALUES ('$USER_ID', '$DEMO_USERNAME')
ON CONFLICT(user_id) DO NOTHING;"
SELECT omnivore.user.id, '$DEMO_USERNAME'
FROM omnivore.user
WHERE email = '$DEMO_EMAIL'
ON CONFLICT (username) DO UPDATE SET
user_id = EXCLUDED.user_id;"
echo "Created demo user with email: $DEMO_EMAIL"
fi