diff --git a/main.py b/main.py index 8671baa..527b22d 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,8 @@ from MonetDB import * from PostgreSQL import * import time +data =[] +header=["Nom de requete","Temps"] #Monet DB requeteSelect1MonetDB = """SELECT * FROM flights WHERE "AIRLINE" = 'AA';""" requeteSelect2MonetDB = """SELECT * FROM flights;""" @@ -22,13 +24,26 @@ requeteCreateTablePostgreSQL = """CREATE TABLE flights10 AS SELECT * FROM FLIGHT requeteDeletePostgreSQL = """DELETE FROM flights WHERE "DAY" > 10""" requeteInsertPostgreSQL = """INSERT INTO flights SELECT * FROM flights10""" + def display_table(data, headers): - max_len = max(len(header) for header in headers) - print(" | ".join(header.ljust(max_len) for header in headers)) - sep = "-" * max_len - print("-|-".join(sep for _ in headers)) - for row in data: - print(" | ".join(header.ljust(max_len) for header in row)) + # Calculate the maximum length for each column based on headers and data + column_lengths = [len(header) for header in headers] + for row in data: + for idx, cell in enumerate(row): + column_lengths[idx] = max(column_lengths[idx], len(str(cell))) # Convert cell to string + + # Create format string for each row + row_format = " | ".join(["{{:<{}}}".format(length) for length in column_lengths]) + + # Print headers + print(row_format.format(*headers)) + + # Print separator + print("-|-".join(['-' * length for length in column_lengths])) + + # Print each data row + for row in data: + print(row_format.format(*[str(cell) for cell in row])) # Ensure cells are strings def initMonetDB(): reset_data_monetdb() @@ -71,16 +86,19 @@ def execPostgreSQL(str): requete_postgres(str) end_time = time.time() print("[PostgreSQL] requete :", str, "\n time = ", (end_time - start_time), "s") + return end_time - start_time def runPostgreSQL(): - execPostgreSQL(requeteSelect1PostgreSQL) - execPostgreSQL(requeteSelect2PostgreSQL) - execPostgreSQL(requeteSelect3PostgreSQL) - execPostgreSQL(requeteSelect4PostgreSQL) + data.append([requeteSelect1PostgreSQL,execPostgreSQL(requeteSelect1PostgreSQL)]) + data.append([requeteSelect2PostgreSQL,execPostgreSQL(requeteSelect2PostgreSQL)]) + data.append([requeteSelect3PostgreSQL,execPostgreSQL(requeteSelect3PostgreSQL)]) + data.append([requeteSelect4PostgreSQL,execPostgreSQL(requeteSelect4PostgreSQL)]) if __name__ == '__main__': #initMonetDB() #runMonetDB() #initPostgreSQL() - runPostgreSQL() + + runPostgreSQL() + display_table(data, header)