Changed some issues with the scope of psycopg cursors in some scripts

lib/upgrade-db.py

@@ -14,7 +14,6 @@ from psycopg2 import errorcodes
 
 # setup or upgrade the database
 
-
 def log(s, error=False):
     if error:
         print(f"{s}", file=sys.stderr)
@@ -39,119 +38,80 @@ def execute_sql_statement(cursor:_cursor, connection:_connection, sql_statement)
 
 
 if __name__ == "__main__":
-
-    exit_code = 0
-    
+    exit_code = 1
+    conn = connect(
+        user = os.environ["PGDB_USER"],
+        password = os.environ["PGDB_PASSWORD"],
+        host = os.environ["PGDB_HOST"],
+        port = os.environ["PGDB_PORT"],
+        database = os.environ["PGDB_DB"]
+    )
+    cur = conn.cursor()
     try:
-
         log("\nSetting up/upgrading database...")
-
-        conn = connect(
-            user = os.environ["PGDB_USER"],
-            password = os.environ["PGDB_PASSWORD"],
-            host = os.environ["PGDB_HOST"],
-            port = os.environ["PGDB_PORT"],
-            database = os.environ["PGDB_DB"]
-        )
-
-        cur = conn.cursor()
-
-
         # # # # #
-
         log("Not deleting register_balance. You can delete it via the Admin Panel (Globals -> register_balance), as it is no more used.")
-
         execute_sql_statement(cur, conn, """
             insert into app_global
             values ('global_message', 'Here you can set a global message that will be shown to every user.', 0.0, '');
         """)
-
         execute_sql_statement(cur, conn, """
             insert into app_global
             values ('admin_info', 'Here you can set am infotext that will be displayed on the admin panel.', 0.0, '');
         """)
-
         execute_sql_statement(cur, conn, """
             create or replace view app_userdeposits_view as
                 select * from app_registertransaction
                 where is_user_deposit = true;
         """)
-
         # # # # #
-
-
         # set app_version in file and database
-
         # database
-
         try:
-
             cur.execute("""
                 select value from application_info
                 where key = 'app_version';
             """)
-
             result = cur.fetchone()
-
             if result == None:
-
                 cur.execute(f"""
                     insert into application_info values ('app_version', '{os.environ['APP_VERSION']}');
                 """)
-
                 conn.commit()
-
             else:
-
                 cur.execute(f"""
                     update application_info set value = '{os.environ['APP_VERSION']}' where key = 'app_version';
                 """)
-
                 conn.commit()
-
         except Error as err:
-
             if err.pgcode == errorcodes.UNDEFINED_TABLE:
-
                 try:
-
                     conn.rollback()
-
                     cur.execute("""
                         create table application_info (
                             key varchar(32) primary key,
                             value text
                         );
                     """)
-
                     cur.execute(f"""
                         insert into application_info values ('app_version', '{os.environ['APP_VERSION']}');
                     """)
-
                     conn.commit()
-
                 except Error as err2:
-
                     log(f"An error occurred while setting app_version in table application_info: {err}", error=True)
                     exit_code = 1
-
             else:
-
                 log(f"An error occurred while setting app_version in table application_info: {err}", error=True)
                 exit_code = 1
-        
         # file
-
         Path("./config/db_app_version.txt").write_text(os.environ["APP_VERSION"])
+        # done
+        exit_code = 0
         log("done with db setup/upgrade.")
-
     except (Error, Exception) as err:
-
         log(f"An error occured while upgrading the database at {os.environ['PGDB_HOST']}:\n{err}", error=True)
         exit_code = 1
-
     finally:
-
         cur.close()
         conn.close()
         exit(exit_code)