From 18a269e1045938356475aa08a2b5aa672872ad11 Mon Sep 17 00:00:00 2001
From: Minh VU <tuan-minh.vu@etudiant.univ-rennes1.fr>
Date: Wed, 4 Dec 2024 10:12:41 +0100
Subject: [PATCH]  ok

---
 MonetDB.py | 69 +++++++++++++++++++++++++++++++++++++-----------------
 main.py    | 11 ++++-----
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/MonetDB.py b/MonetDB.py
index f13e11c..abf7a80 100644
--- a/MonetDB.py
+++ b/MonetDB.py
@@ -61,32 +61,57 @@ peuplementFlights = r"COPY INTO flights FROM 'C:\\Users\\Public\\2015_Flight_Del
 
 def connect_monetdb():
     connection = pymonetdb.connect(username="monetdb", password="monetdb", hostname="localhost", database="demo")
-    # create a cursor
     cursor = connection.cursor()
     return connection, cursor
 
-def create_table_monetdb(connection,cursor):
-    cursor.execute(createAirline)
-    cursor.execute(createAirports)
-    cursor.execute(createFlights)
-    connection.commit()
+def create_table_monetdb():
+    try:
+        with connect_monetdb()[0] as conn:
+            with connect_monetdb()[1] as cursor:
+                cursor.execute(createAirline)
+                cursor.execute(createAirports)
+                cursor.execute(createFlights)
+            conn.commit()
+        cursor.close()
+        conn.close()
+    except(pymonetdb.DatabaseError,Exception) as error:
+        print(error)
 
-def load_data_monetdb(connection,cursor):
-    cursor.execute(peuplementAirlines)
-    cursor.execute(peuplementAirports)
-    cursor.execute(peuplementFlights)
-    connection.commit()
+def load_data_monetdb():
+    try:
+        with connect_monetdb()[0] as conn:
+            with connect_monetdb()[1] as cursor:
+                cursor.execute(peuplementAirports)
+                cursor.execute(peuplementAirlines)
+                cursor.execute(peuplementFlights)
+            conn.commit()
+        cursor.close()
+        conn.close()
+    except(pymonetdb.DatabaseError,Exception) as error:
+        print(error)
 
-def requete_monetdb(connection,cursor,str):
-    cursor.execute(str)
-    connection.commit()
+def requete_monetdb(str):
+    try:
+        with connect_monetdb()[0] as conn:
+            with connect_monetdb()[1] as cursor:
+                cursor.execute(peuplementAirports)
+                cursor.execute(peuplementAirlines)
+                cursor.execute(peuplementFlights)
+            conn.commit()
+        cursor.close()
+        conn.close()
+    except(pymonetdb.DatabaseError, Exception) as error:
+        print(error)
 
 def reset_data_monetdb(connection,cursor):
-    cursor.execute("DROP TABLE IF EXISTS airlines")
-    cursor.execute("DROP TABLE IF EXISTS airports")
-    cursor.execute("DROP TABLE IF EXISTS flights")
-    connection.commit()
-
-def disconnect_monetdb(connection,cursor):
-    cursor.close()
-    connection.close()
+    try:
+        with connect_monetdb()[0] as conn:
+            with connect_monetdb()[1] as cursor:
+                cursor.execute("DROP TABLE IF EXISTS airlines")
+                cursor.execute("DROP TABLE IF EXISTS airports")
+                cursor.execute("DROP TABLE IF EXISTS flights")
+            conn.commit()
+        cursor.close()
+        conn.close()
+    except(pymonetdb.DatabaseError, Exception) as error:
+        print(error)
\ No newline at end of file
diff --git a/main.py b/main.py
index ac40447..943b09b 100644
--- a/main.py
+++ b/main.py
@@ -22,10 +22,10 @@ requeteCreateTablePostgreSQL = """CREATE TABLE flights10 AS SELECT * FROM FLIGHT
 requeteDeletePostgreSQL = """DELETE FROM flights WHERE "DAY" > 10"""
 requeteInsertPostgreSQL = """INSERT INTO flights SELECT * FROM flights10"""
 
-def initMonetDB(conn,cursor):
-    reset_data_monetdb(conn,cursor)
-    create_table_monetdb(conn,cursor)
-    load_data_monetdb(conn,cursor)
+def initMonetDB():
+    reset_data_monetdb()
+    create_table_monetdb()
+    load_data_monetdb()
 
 def execMonetDB(conn,cursor,str):
     requete_monetdb(conn,cursor, str)
@@ -44,7 +44,6 @@ def runMonetDB():
     initMonetDB(conn,cursor)
     print(time.time() - start)
     #execMoneDB(conn,cursor,requeteSelect1MonetDB)
-    disconnect_monetdb(conn, cursor)
 
 def runPostgreSQL():
     reset_database_postgres()
@@ -55,7 +54,5 @@ def runPostgreSQL():
     #requete_postgres(str)
 
 if __name__ == '__main__':
-    #PostgreSQL
     runMonetDB()
     #runPostgreSQL()
-    #MonetDB