From 623e1730a68dc317b26b78120f07a8d7399b85f0 Mon Sep 17 00:00:00 2001 From: Dikson Santos Date: Sun, 26 Nov 2023 17:51:19 -0300 Subject: [PATCH] chore: update function description --- sql/dados.sql | 2 +- sql/esquema.sql | 16 ++++++++-------- src/utils.py | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sql/dados.sql b/sql/dados.sql index 5bcfc66..298957d 100644 --- a/sql/dados.sql +++ b/sql/dados.sql @@ -12,7 +12,7 @@ END; $$ LANGUAGE PLPGSQL; -INSERT INTO PESSOA (EMAIL, NOME, SENHA, TELEFONE, DATA) +INSERT INTO PESSOA (EMAIL, NOME, SENHA, TELEFONE, DATA_NASC) VALUES ('j_silva@gmail.com', 'João Silva', 'R$w#2gFq7P', '(11)99876-5432', format_date('1997/10/12')), ('mari.asantos@gmail.com', 'Maria Santos', 't9*G@zKp$L', '(21)95555-1234', format_date('1998/10/16')), ('pcosta1999@gmail.com', 'Pedro Costa', '5xU$P#zJwY', '(31)97777-8888', format_date('1999/05/05')), diff --git a/sql/esquema.sql b/sql/esquema.sql index 9af7bfe..be5a555 100644 --- a/sql/esquema.sql +++ b/sql/esquema.sql @@ -3,7 +3,7 @@ CREATE TABLE PESSOA ( NOME VARCHAR(60) NOT NULL, SENHA VARCHAR(50) NOT NULL, TELEFONE VARCHAR(15) NOT NULL, - DATA DATE NOT NULL, + DATA_NASC DATE NOT NULL, CONSTRAINT PK_PESSOA PRIMARY KEY(EMAIL), CONSTRAINT SK_PESSOA UNIQUE(TELEFONE), CONSTRAINT CK_EMAIL CHECK(EMAIL LIKE '%@%.com'), @@ -61,8 +61,8 @@ CREATE TABLE RACA ( CREATE TABLE EXPEDICAO ( PILOTO VARCHAR(50) NOT NULL, NAVE INTEGER NOT NULL, - DH_INICIO DATE NOT NULL, - DH_FIM DATE NOT NULL, + DH_INICIO TIMESTAMP NOT NULL, + DH_FIM TIMESTAMP NOT NULL, ROTA VARCHAR(50) NOT NULL, CONSTRAINT PK_EXPEDICAO PRIMARY KEY(NAVE, DH_INICIO), CONSTRAINT FK_NAVE FOREIGN KEY(NAVE) REFERENCES NAVE(NUMERO_REGISTRO) ON DELETE CASCADE, @@ -71,7 +71,7 @@ CREATE TABLE EXPEDICAO ( CREATE TABLE EXPEDICAO_TURISTA ( NAVE INTEGER NOT NULL, - DH_INICIO DATE NOT NULL, + DH_INICIO TIMESTAMP NOT NULL, TURISTA VARCHAR(50) NOT NULL, CONSTRAINT PK_EXP_TUR PRIMARY KEY(NAVE, DH_INICIO, TURISTA), CONSTRAINT FK_EXPEDICAO FOREIGN KEY(NAVE, DH_INICIO) REFERENCES EXPEDICAO(NAVE, DH_INICIO) ON DELETE CASCADE, @@ -144,8 +144,8 @@ CREATE TABLE COLONIA ( GALAXIA VARCHAR(50) NOT NULL, NOME_PLANETA VARCHAR(50) NOT NULL, FACCAO_NOME VARCHAR(50) NOT NULL, - DH_INICIO DATE NOT NULL, - DH_FIM DATE, + DH_INICIO TIMESTAMP NOT NULL, + DH_FIM TIMESTAMP, NOME VARCHAR(50), CONSTRAINT PK_COLONIA PRIMARY KEY(ID), CONSTRAINT SK_COLONIA UNIQUE(GALAXIA, NOME_PLANETA, FACCAO_NOME, DH_INICIO), @@ -155,8 +155,8 @@ CREATE TABLE COLONIA ( CREATE TABLE GUERRA ( AGRESSOR INTEGER NOT NULL, DEFENSOR INTEGER NOT NULL, - DH_INICIO DATE NOT NULL, - DH_FIM DATE, + DH_INICIO TIMESTAMP NOT NULL, + DH_FIM TIMESTAMP, OBITOS INTEGER, CONSTRAINT PK_GUERRA PRIMARY KEY(AGRESSOR, DEFENSOR, DH_INICIO), CONSTRAINT FK_AGRESSOR FOREIGN KEY(AGRESSOR) REFERENCES COLONIA(ID), diff --git a/src/utils.py b/src/utils.py index fd172f0..0657b1a 100644 --- a/src/utils.py +++ b/src/utils.py @@ -13,6 +13,7 @@ def query_to_rich_table(cursor: cursor, query: str): table.add_column(col) for row in data: + print(row) table.add_row(*[str(item) for item in row]) return table