Merge branch 'master' into rorden

# Conflicts:
#	2.database/01.CreateTables.sql
#	2.database/02.Datos_prueba.sql
This commit is contained in:
Roberto Orden Erena
2019-12-26 12:25:32 +01:00
32 changed files with 946 additions and 201 deletions

View File

@@ -170,11 +170,11 @@ CREATE TABLE myhealth.visit
(
id INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY ( INCREMENT 1 START 1 MINVALUE 1 MAXVALUE 2147483647 CACHE 1 ),
date date NOT NULL,
"time" abstime NOT NULL,
"time" time NOT NULL,
observations TEXT COLLATE pg_catalog."default",
result TEXT COLLATE pg_catalog."default",
patientid INTEGER REFERENCES myhealth.patient(id),
familydoctorid INTEGER REFERENCES myhealth.familydoctor(id),
patientid INTEGER REFERENCES myhealth.patient(id) NOT NULL,
familydoctorid INTEGER REFERENCES myhealth.familydoctor(id) NOT NULL,
CONSTRAINT visit_pkey PRIMARY KEY (id)
)
TABLESPACE pg_default;