From 595dd4e9ac2cfafde83f1b70a04d4eb1a90784e0 Mon Sep 17 00:00:00 2001
From: trochas <thibaut.rochas@etudiant.univ-rennes1.fr>
Date: Wed, 4 Dec 2024 11:12:16 +0100
Subject: [PATCH] =?UTF-8?q?correction=20requ=C3=AAtes=20et=204=20premi?=
 =?UTF-8?q?=C3=A8re=20requ=C3=AAtes=20Select=20test=C3=A9=20MonetDB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py | 49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/main.py b/main.py
index ac40447..f6e99d9 100644
--- a/main.py
+++ b/main.py
@@ -5,8 +5,8 @@ import time
 #Monet DB
 requeteSelect1MonetDB = """SELECT * FROM flights WHERE "AIRLINE" = 'AA';"""
 requeteSelect2MonetDB = """SELECT * FROM flights;"""
-requeteSelect3MonetDB = """SELECT * FROM flight WHERE “DAY” > 10;"""
-requeteSelect4MonetDB = """SELECT * FROM flight WHERE “DAY” > 30;"""
+requeteSelect3MonetDB = """SELECT * FROM flights WHERE "DAY" > 10;"""
+requeteSelect4MonetDB = """SELECT * FROM flights WHERE "DAY" > 30;"""
 
 requeteCreateTableMonetDB = """CREATE TABLE flights10 AS SELECT * FROM FLIGHTS WHERE "DAY" > 10;"""
 requeteDeleteMonetDB = """DELETE FROM flights WHERE "DAY" > 10;"""
@@ -15,21 +15,13 @@ requeteInsertMonetDB = """INSERT INTO flights SELECT * FROM flights10;"""
 #Postgre SQL
 requeteSelect1PostgreSQL = """SELECT * FROM public.flights WHERE airline = 'AA'"""
 requeteSelect2PostgreSQL = """SELECT * FROM public.flights"""
-requeteSelect3PostgreSQL = """SELECT * FROM public.flight WHERE “DAY” > 10"""
-requeteSelect4PostgreSQL = """SELECT * FROM public.flight WHERE “DAY” > 30"""
+requeteSelect3PostgreSQL = """SELECT * FROM public.flight WHERE "DAY" > 10"""
+requeteSelect4PostgreSQL = """SELECT * FROM public.flight WHERE "DAY" > 30"""
 
 requeteCreateTablePostgreSQL = """CREATE TABLE flights10 AS SELECT * FROM FLIGHTS WHERE "DAY" > 10"""
 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 execMonetDB(conn,cursor,str):
-    requete_monetdb(conn,cursor, str)
-
 def display_table(data, headers):
      max_len = max(len(header) for header in headers)
      print(" | ".join(header.ljust(max_len) for header in headers))
@@ -38,20 +30,47 @@ def display_table(data, headers):
      for row in data:
         print(" | ".join(header.ljust(max_len) for header in row))
 
+
+#start_time = time.time()
+#end_time = time.time()
+#print(end_time - start_time)
+
+
+def initMonetDB(conn,cursor):
+    reset_data_monetdb(conn,cursor)
+
+    start_time = time.time()
+    create_table_monetdb(conn,cursor)
+    end_time = time.time()
+    print("[MonetDB] creat table: time = ", (end_time - start_time), "s")
+
+    start_time = time.time()
+    load_data_monetdb(conn,cursor)
+    end_time = time.time()
+    print("[MonetDB] load data : time = ", (end_time - start_time), "s")
+
+def execMonetDB(conn,cursor,str):
+    start_time = time.time()
+    requete_monetdb(conn,cursor, str)
+    end_time = time.time()
+    print("[MonetDB] requete :", str , "\n time = ", (end_time - start_time), "s")
+
 def runMonetDB():
     conn, cursor =connect_monetdb()
     start = time.time()
     initMonetDB(conn,cursor)
     print(time.time() - start)
-    #execMoneDB(conn,cursor,requeteSelect1MonetDB)
+    execMonetDB(conn,cursor,requeteSelect1MonetDB)
+    execMonetDB(conn,cursor,requeteSelect2MonetDB)
+    execMonetDB(conn,cursor,requeteSelect3MonetDB)
+    execMonetDB(conn,cursor,requeteSelect4MonetDB)
+
     disconnect_monetdb(conn, cursor)
 
 def runPostgreSQL():
     reset_database_postgres()
-    start_time = time.time()
     create_tables_postgres()
     create_data_postgres()
-    print(time.time() - start_time)
     #requete_postgres(str)
 
 if __name__ == '__main__':