Skip to content

Commit

Permalink
Merge pull request #376 from madeofpendletonwool/7.2-ready
Browse files Browse the repository at this point in the history
fix add_user issue
  • Loading branch information
madeofpendletonwool authored Dec 22, 2024
2 parents cf61821 + 6695890 commit 5a43d6e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-tauri-clients.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
run: |
sudo apt update
sudo apt install -qy libgtk-3-dev
sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
- name: wasm-addition
run: |
Expand Down
20 changes: 11 additions & 9 deletions database_functions/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,7 @@ def add_person_podcast(cnx, database_type, podcast_values, user_id, username=Non
def add_user(cnx, database_type, user_values):
cursor = cnx.cursor()
try:
print(f"Adding user with values: {user_values}")
if database_type == "postgresql":
add_user_query = """
INSERT INTO "Users"
Expand All @@ -469,18 +470,19 @@ def add_user(cnx, database_type, user_values):
if result is None:
raise Exception("Failed to create user - no ID returned")

# Handle both tuple and dict return types
user_id = result[0] if isinstance(result, tuple) else result.get('userid', result[0])
# Print the result for debugging
print(f"Raw PostgreSQL result: {result}")
logging.debug(f"Raw PostgreSQL result: {result}")

if not user_id:
raise Exception("Failed to create user - invalid ID returned")
# Handle different return types
if isinstance(result, dict):
# Try different case variations
user_id = result.get('userid') or result.get('UserID') or result.get('userId') or result.get('user_id')
else:
user_id = result[0]

logging.debug(f"PostgreSQL insert result: {result}, extracted user_id: {user_id}")
else:
user_id = cursor.lastrowid
if not user_id:
raise Exception("Failed to create user - no ID returned")

raise Exception("Failed to create user - invalid ID returned")
# Add user settings
settings_query = """
INSERT INTO "UserSettings"
Expand Down

0 comments on commit 5a43d6e

Please sign in to comment.