1818id = config [0 ][0 ]
1919pwd = config [0 ][1 ]
2020host = config [0 ][2 ]
21- engine = create_engine ('postgresql://%s:%s@%s/dvf2' % (id , pwd , host ))
21+ #engine = create_engine('postgresql://%s:%s@%s/dvf2'%(id, pwd, host))
22+ #table = "public.dvf"
23+ engine = create_engine ('mysql+pymysql://%s:%s@%s/dvf2' % (id , pwd , host ))
24+ table = "dvf"
2225
2326# Chargement des natures de culture plus besoin
2427
2528@app .route ('/api/dates2' )
2629def dates ():
27- dateMin = pd .read_sql (""" SELECT min(date_mutation) FROM public.dvf """ , engine )
28- dateMax = pd .read_sql (""" SELECT max(date_mutation) FROM public.dvf """ , engine )
30+ dateMin = pd .read_sql ("SELECT min(date_mutation) FROM " + table , engine )
31+ dateMax = pd .read_sql ("SELECT max(date_mutation) FROM " + table , engine )
2932 return '{"min": "' + str (dateMin ['min' ][0 ]) + '", "max": "' + str (dateMax ['max' ][0 ]) + '"}'
3033
3134
@@ -56,7 +59,7 @@ def send_donneesgeo(path):
5659
5760@app .route ('/api/mutations2/<commune>/<sectionPrefixee>/from=<dateminimum>&to=<datemaximum>' )
5861def get_mutations2 (commune , sectionPrefixee , dateminimum , datemaximum ):
59- mutations = pd .read_sql (""" SELECT * FROM public.dvf WHERE code_commune = %(code)s AND section_prefixe = %(sectionPrefixee)s AND date_mutation >= %(datemin)s AND date_mutation <= %(datemax)s "" " , engine , params = {"code" : commune , "sectionPrefixee" : sectionPrefixee , "datemin" : dateminimum , "datemax" : datemaximum })
62+ mutations = pd .read_sql ("SELECT * FROM " + table + " WHERE code_commune = %(code)s AND section_prefixe = %(sectionPrefixee)s AND date_mutation >= %(datemin)s AND date_mutation <= %(datemax)s " , engine , params = {"code" : commune , "sectionPrefixee" : sectionPrefixee , "datemin" : dateminimum , "datemax" : datemaximum })
6063
6164 mutations = mutations .applymap (str ) # Str pour éviter la conversion des dates en millisecondes.
6265 nbMutations = len (mutations .id_mutation .unique ())
@@ -67,15 +70,15 @@ def get_mutations2(commune, sectionPrefixee, dateminimum, datemaximum):
6770
6871@app .route ('/api/mutations3/<commune>/<sectionPrefixee>' )
6972def get_mutations3 (commune , sectionPrefixee ):
70- mutations = pd .read_sql (""" SELECT * FROM public.dvf WHERE code_commune = %(code)s AND section_prefixe = %(sectionPrefixee)s"" " , engine , params = {"code" : commune , "sectionPrefixee" : sectionPrefixee })
73+ mutations = pd .read_sql ("SELECT * FROM " + table + " WHERE code_commune = %(code)s AND section_prefixe = %(sectionPrefixee)s" , engine , params = {"code" : commune , "sectionPrefixee" : sectionPrefixee })
7174 mutations = mutations .applymap (str ) # Str pour éviter la conversion des dates en millisecondes.
7275 json_mutations = '{"mutations": ' + mutations .to_json (orient = 'records' ) + '}'
7376 return json_mutations
7477
7578
7679@app .route ('/api/parcelles2/<parcelle>/from=<dateminimum>&to=<datemaximum>' )
7780def get_parcelle (parcelle , dateminimum , datemaximum ):
78- mutations = pd .read_sql (""" SELECT * FROM public.dvf WHERE id_parcelle = %(code)s AND date_mutation >= %(datemin)s AND date_mutation <= %(datemax)s ;"" " ,
81+ mutations = pd .read_sql ("SELECT * FROM " + table + " WHERE id_parcelle = %(code)s AND date_mutation >= %(datemin)s AND date_mutation <= %(datemax)s ;" ,
7982 engine ,
8083 params = {"code" : parcelle , "datemin" : dateminimum , "datemax" : datemaximum })
8184 mutations = mutations .sort_values (by = ['date_mutation' ], ascending = False )
@@ -99,7 +102,7 @@ def get_parcelle(parcelle, dateminimum, datemaximum):
99102 infos = infos .to_json (orient = 'records' )
100103
101104 # Mutations liées
102- mutations_liees = pd .read_sql (""" SELECT * FROM public.dvf WHERE id_mutation = %(id_mutation)s AND id_parcelle<> %(parcelle)s;"" " ,
105+ mutations_liees = pd .read_sql ("SELECT * FROM " + table + " WHERE id_mutation = %(id_mutation)s AND id_parcelle<> %(parcelle)s;" ,
103106 engine ,
104107 params = {"id_mutation" : mutationIndex , "parcelle" : parcelle })
105108 mutations_liees ['type_local' ].replace ('Local industriel. commercial ou assimilé' , 'Local industriel commercial ou assimilé' , inplace = True )
0 commit comments