From bdb9d3afb0dffc5dabac7f13e879a7beb420afd5 Mon Sep 17 00:00:00 2001
From: trochas <thibaut.rochas@etudiant.univ-rennes1.fr>
Date: Wed, 4 Dec 2024 10:05:31 +0100
Subject: [PATCH] ajout de fonction dans le main

---
 __pycache__/MonetDB.cpython-312.pyc    | Bin 3249 -> 4741 bytes
 __pycache__/PostgreSQL.cpython-312.pyc | Bin 4873 -> 5633 bytes
 main.py                                |  24 ++++++++++++++++++------
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/__pycache__/MonetDB.cpython-312.pyc b/__pycache__/MonetDB.cpython-312.pyc
index c054bb85a52ab12681b46b8264e0fa16f2e874be..92752b0293f9a5da88e99d6e3a90cff07c04e441 100644
GIT binary patch
literal 4741
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
TQ?Bqqt=mt{?)UmAXIK0W-n`8o

delta 931
zcmZvb&u<bz6vuaHixmPwL#(1Un>A>OHKB%j5D!jw2bj3*lG#}(hGf$NZBcA1povXP
z>!ErkbMT`63&wEoMQ^<rulxbV8>Tno!N-p+P~BvIywAKJ-#7F2F!uR!@Hi0gNpKx!
z%uVcT1ur4ix@jpdQ9SUo$Bn(mDkGQ^nd4QR$m`X5t-4)lEVjNS#Wl1Lji>g$p7q$>
zsW*Eb5%CGh`wFHkZ!)gP1<ceeW{b;-M0`nBRLV;unCvr)L#+|K)AuuNgR_5Jb<8QZ
zHSh+3I^@$$BQr+gsrC0BN!p)Kw^6HZZh<(ZL@-liYH$e5nFi0ghK8ZifWxO_rkx@o
z4_ySk=+ro?Fs;)}mOF->TP3GiIi@<G@PN6!-;FPcjp+sPVOpswmYOA+trN}BNFFn8
zGsrxw?E;6>+<&M>^pQ}G*QjIKu*HMmVwMoy0`2Jm5l1ugmI4uZ3u=uggnlM$jlu~S
z>S;kYli{ZBm!d;c9C@SSmp8JaV8&<x>(IxTER7Zj<3w{~)m~;D+8wI;c<y?CIvlHH
zagv)1wuovon2<?2-2X`klRz9;Q5jD2$)zI9ZkDhy7*G9vt(y5#Z>vnX{eAYW=gI^1
zUfFI`>W%V?=TEEKWv$Y9(%jiC=a$RjjsHFhwZHgl2wiL^0xCjRMKgGU6tQ(7DSm_w
zXJYW5+z`*gF%%T<!VZdwKjG-gEuaYQ#v^!irw~FNDb$ht9qD}6D}`U7gFx3K&8<xx
Y1mPWS_`voGI(OT5GV4L}^$3Lh1;$kO?EnA(

diff --git a/__pycache__/PostgreSQL.cpython-312.pyc b/__pycache__/PostgreSQL.cpython-312.pyc
index d87f0c0da62e06f360e3c46d33ba01741c576a96..67c32da1c1591fe63b043618dd762480adf7420b 100644
GIT binary patch
delta 567
zcmeBFYt-R8&CAQh00d=X0qLIn6Zs?<jV7w=a;31fFhsFcGHS9<j98}|nrsylTAW%`
z921g}nUq*s662qj>Qa<hmKx)081Ly5<K*HJ6Ovk7;#gXezgdy7MsV^3Mlr^s$pZW`
z%nUUQllA%KB^hfNvsgh^p@I~~$^HD&%nVuVlMVT$CO_v^nw-NV2;_5u`SAjxlh-o^
z)H9U`!t~WJt!9L<85trOQW$EP>X<5_bU9-=Lj`jrLph@+lV6pdOOStnLWrZ2kE?>G
zn}TbEXK+ZcLRwB{dPYgHPGV+JPG(*zm{E{lR8m|d1T<EYxkwsF6$yg~Ss+o&3?%9m
z6cmd1fs9+?MXAN9CGjbVC5cIi#i{WH`NbvaK(QiiplmKkeG8CiVEDkq!76%(SN008
z`~s63f}+!<CrVF|U7&VDKx{hSM7|61{#OJ7zB4lj$v@x`==bjQ?(x0BBh>HH>C@x)
zos)r2;R6=~CvQJjCs!}ecTPc|x(Twsfa>`aF7V3#{=zePBA2pvu?x_yCN3uqh8{sj
z8|Jw}js~pjHGr&x;u1i?g9faQmYfGo*+C*UtWK=#hZxy`;)ggSoy?dIDRMg*G9NNz
v1+q2SC(jp>XVjj&OGuVW2WTiLgo{-tKNOPV|D?pjDEe83lToyY4=4%%<TQ>5

delta 130
zcmZqF=~Ux8&CAQh00fqt{^>V)C-O-!>P%GEWvOJ;WSbbbPTJYoDkiizwWv6ztTZ<>
zFUBRcIJ+djAja1)X0s(@jUbaI+vHwR`N<naC5^Oz#xMeLu>z3zz|6?Vc$<OyHUs}B
d7B)t<PXhLgqMuxt_!vb$EAcRj7V!ZU0RY7EARhn#

diff --git a/main.py b/main.py
index 666bf1b..f4d7cb2 100644
--- a/main.py
+++ b/main.py
@@ -1,5 +1,5 @@
 from MonetDB import *
-from PostgreSQL import *
+#from PostgreSQL import *
 import re
 
 #Monet DB
@@ -16,12 +16,21 @@ requeteInsertMonetDB = """INSERT INTO flights SELECT * FROM flights10;"""
 requeteSelect1PostgreSQL = """SELECT * FROM public.flights WHERE airline = 'AA'"""
 requeteSelect2PostgreSQL = """SELECT * FROM public.flights"""
 requeteSelect3PostgreSQL = """SELECT * FROM public.flight WHERE “DAY” > 10"""
-requeteSelect2PostgreSQL = """SELECT * FROM public.flight WHERE “DAY” > 30"""
+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 initMoneDB(conn,cursor):
+    reset_data_monetdb(conn,cursor)
+    create_table_monetdb(conn,cursor)
+    create_data_monetdb(conn,cursor)
+    create_data_monetdb(conn,cursor)
+
+def execMoneDB(conn,cursor,str):
+    requete_monetdb(conn,cursor, str)
+    
 
 if __name__ == '__main__':
     #PostgreSQL
@@ -31,7 +40,10 @@ if __name__ == '__main__':
 
     #MonetDB
     conn, cursor =connect_monetdb()
-    create_table_monetdb(conn,cursor)
-    #create_data_monetdb(conn,cursor)
-    #requete_monetdb(conn,cursor, str)
-    #disconnect_monetdb(conn, cursor)
+    initMoneDB(conn,cursor)
+    execMoneDB(conn,cursor,requeteSelect1MonetDB)
+    disconnect_monetdb(conn, cursor)
+    
+
+
+