diff --git a/application/config/config.php b/application/config/config.php
index 8f4348614..68b85b62f 100755
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -509,13 +509,9 @@ $config['proxy_ips'] = '';
|--------------------------------------------------------------------------
|
| It's working, so don't delete this :D
- */
+*/
spl_autoload_register(function ($class) {
if (substr($class,0,3) !== 'CI_' && substr($class,0,4) !== 'FHC_')
- {
- if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
- {
- require_once $file;
- }
- }
-});
\ No newline at end of file
+ if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
+ require_once $file;
+});
diff --git a/phpci.yml b/phpci.yml
index 3553c093a..00f25efbc 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -11,8 +11,8 @@ build_settings:
user: 'fhcomplete'
pass: 'fhcomplete'
setup:
- shell:
- - "pkill -f fhctest &"
+# shell:
+# - "pkill -f fhctest &"
composer:
directory: ""
action: "install"
diff --git a/system/dbupdate_3.2.php b/system/dbupdate_3.2.php
index 478010e5e..73e6f86c5 100644
--- a/system/dbupdate_3.2.php
+++ b/system/dbupdate_3.2.php
@@ -24,13 +24,13 @@
//Spalte studiensemester_kurzbz für Reihungstest
if(!$result = @$db->db_query("SELECT studiensemester_kurzbz FROM public.tbl_reihungstest LIMIT 1"))
{
- $qry = "ALTER TABLE public.tbl_reihungstest ADD COLUMN studiensemester_kurzbz varchar(16);
- ALTER TABLE public.tbl_reihungstest ADD CONSTRAINT fk_reihungsteset_studiensemester FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester (studiensemester_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;";
+ $qry = "ALTER TABLE public.tbl_reihungstest ADD COLUMN studiensemester_kurzbz varchar(16);
+ ALTER TABLE public.tbl_reihungstest ADD CONSTRAINT fk_reihungsteset_studiensemester FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester (studiensemester_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;";
- if(!$db->db_query($qry))
- echo 'public.tbl_reihungstest: '.$db->db_last_error().'
';
+ if(!$db->db_query($qry))
+ echo 'public.tbl_reihungstest: '.$db->db_last_error().'
';
else
- echo 'public.tbl_reihungstest: Spalte studiensemester_kurzbz hinzugefuegt';
+ echo 'public.tbl_reihungstest: Spalte studiensemester_kurzbz hinzugefuegt';
}
// Neue Spalte beschreibung_mehrsprachig bei tbl_dokument
@@ -42,8 +42,8 @@ if(!@$db->db_query("SELECT dokumentbeschreibung_mehrsprachig FROM public.tbl_dok
if(!$db->db_query($qry))
echo 'public.tbl_dokument '.$db->db_last_error().'
';
- else
- echo '
Spalte dokumentbeschreibung_mehrsprachig in public.tbl_dokument hinzugefügt';
+ else
+ echo '
Spalte dokumentbeschreibung_mehrsprachig in public.tbl_dokument hinzugefügt';
}
// Neue Spalte beschreibung_mehrsprachig bei tbl_dokumentstudiengang
@@ -66,10 +66,10 @@ if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants
{
$qry = "GRANT DELETE ON testtool.tbl_frage TO web;
- GRANT DELETE ON testtool.tbl_gebiet TO web;
- GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_ablauf TO web;
- GRANT SELECT, UPDATE ON testtool.tbl_ablauf_ablauf_id_seq TO web;
- ";
+ GRANT DELETE ON testtool.tbl_gebiet TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_ablauf TO web;
+ GRANT SELECT, UPDATE ON testtool.tbl_ablauf_ablauf_id_seq TO web;
+ ";
if(!$db->db_query($qry))
echo 'Testtool Berechtigungen: '.$db->db_last_error().'
';
@@ -107,23 +107,23 @@ if(!@$db->db_query("SELECT bewerbung_abgeschicktamum FROM public.tbl_prestudents
//Spalte benotung in lehre.tbl_lehrveranstaltung
if (!$result = @$db->db_query("SELECT benotung FROM lehre.tbl_lehrveranstaltung LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN benotung boolean NOT NULL DEFAULT FALSE;";
+ $qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN benotung boolean NOT NULL DEFAULT TRUE;";
- if (!$db->db_query($qry))
- echo 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_lehrveranstaltung: Spalte benotung hinzugefügt.
';
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_lehrveranstaltung: Spalte benotung hinzugefügt.
';
}
//Spalte lvinfo in lehre.tbl_lehrveranstaltung
if (!$result = @$db->db_query("SELECT lvinfo FROM lehre.tbl_lehrveranstaltung LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN lvinfo boolean NOT NULL DEFAULT FALSE;";
+ $qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN lvinfo boolean NOT NULL DEFAULT TRUE;";
- if (!$db->db_query($qry))
- echo 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_lehrveranstaltung: Spalte lvinfo hinzugefügt.
';
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_lehrveranstaltung: Spalte lvinfo hinzugefügt.
';
}
@@ -178,10 +178,27 @@ if (!$result = @$db->db_query("SELECT curriculum FROM lehre.tbl_studienplan_lehr
echo ' lehre.tbl_studienplan_lehrveranstaltung: Spalte curriculum hinzugefügt.
';
}
+//Spalte export in lehre.tbl_studienordnung_lehrveranstaltung
+if (!$result = @$db->db_query("SELECT export FROM lehre.tbl_studienplan_lehrveranstaltung LIMIT 1;"))
+{
+ $qry = "ALTER TABLE lehre.tbl_studienplan_lehrveranstaltung ADD COLUMN export BOOLEAN DEFAULT TRUE;";
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienplan_lehrveranstaltung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan_lehrveranstaltung: Spalte export hinzugefügt.
';
+}
+//Spalte lehrauftrag in lehre.tbl_lehrveranstaltung
+if (!$result = @$db->db_query("SELECT lehrauftrag FROM lehre.tbl_lehrveranstaltung LIMIT 1;"))
+{
+ $qry = "ALTER TABLE lehre.tbl_lehrveranstaltung ADD COLUMN lehrauftrag BOOLEAN DEFAULT TRUE;";
-
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_lehrveranstaltung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_lehrveranstaltung: Spalte lehrauftrag hinzugefügt.
';
+}
//sozialversicherungsnummer auf char(16) erhöhen
@@ -671,76 +688,98 @@ if(!$result = @$db->db_query("SELECT uhrzeit from lehre.tbl_abschlusspruefung LI
echo 'lehre.tbl_abschlusspruefung: spalte uhrzeit hinzugefügt';
}
+//Tabelle lehre.tbl_studienordnungstatus
+if (!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_studienordnungstatus LIMIT 1;"))
+{
+ $qry = "CREATE TABLE lehre.tbl_studienordnungstatus
+ (
+ status_kurzbz varchar(32) NOT NULL,
+ bezeichnung varchar(256),
+ reihenfolge integer
+ );
+
+ ALTER TABLE lehre.tbl_studienordnungstatus ADD CONSTRAINT pk_studienordnungstatus PRIMARY KEY (status_kurzbz);
+
+ GRANT SELECT ON lehre.tbl_studienordnungstatus TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON lehre.tbl_studienordnungstatus TO vilesci;
+
+ INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('development', 'in Bearbeitung', 1);
+ INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('review', 'in Review', 2);
+ INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('approved', 'genehmigt', 3);
+ INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('expired', 'ausgelaufen', 4);
+ INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('notApproved', 'nicht genehmigt', 5);
+ ";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienordnungstatus: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienordnungstatus: Tabelle hinzugefuegt
';
+}
+
//Spalte status_kurzbz in lehre.tbl_studienordnung
if (!$result = @$db->db_query("SELECT status_kurzbz FROM lehre.tbl_studienordnung LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_studienordnung ADD COLUMN status_kurzbz varchar(32);
-
- ALTER TABLE lehre.tbl_studienordnung ADD CONSTRAINT status_kurzbz FOREIGN KEY (status_kurzbz) REFERENCES addon.tbl_stgv_studienordnungstatus (status_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
- UPDATE lehre.tbl_studienordnung SET status_kurzbz = 'approved';
- ";
-
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienordnung: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienordnung: Spalte status_kurzbz hinzugefügt.
';
-
+ $qry = "ALTER TABLE lehre.tbl_studienordnung ADD COLUMN status_kurzbz varchar(32);
+ ALTER TABLE lehre.tbl_studienordnung ADD CONSTRAINT fk_studienordnung_status_kurzbz FOREIGN KEY (status_kurzbz) REFERENCES lehre.tbl_studienordnungstatus (status_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
+ UPDATE lehre.tbl_studienordnung SET status_kurzbz = 'approved';
+ ";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienordnung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienordnung: Spalte status_kurzbz hinzugefügt.
';
}
//Spalte standort_id in lehre.tbl_studienordnung
if (!$result = @$db->db_query("SELECT standort_id FROM lehre.tbl_studienordnung LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_studienordnung ADD COLUMN standort_id integer;
-
- ALTER TABLE lehre.tbl_studienordnung ADD CONSTRAINT studienordnung_standort_id FOREIGN KEY (standort_id) REFERENCES public.tbl_standort (standort_id) ON DELETE RESTRICT ON UPDATE CASCADE;
- ";
-
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienordnung: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienordnung: Spalte standort_id hinzugefügt.
';
-
+ $qry = "ALTER TABLE lehre.tbl_studienordnung ADD COLUMN standort_id integer;
+ ALTER TABLE lehre.tbl_studienordnung ADD CONSTRAINT studienordnung_standort_id FOREIGN KEY (standort_id) REFERENCES public.tbl_standort (standort_id) ON DELETE RESTRICT ON UPDATE CASCADE;
+ ";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienordnung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienordnung: Spalte standort_id hinzugefügt.
';
}
//Spalte ects_stpl in lehre.tbl_studienplan
if (!$result = @$db->db_query("SELECT ects_stpl FROM lehre.tbl_studienplan LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN ects_stpl numeric(5,2);";
-
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienplan: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienplan: Spalte ects_stpl hinzugefügt.
';
-
+ $qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN ects_stpl numeric(5,2);";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienplan: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan: Spalte ects_stpl hinzugefügt.
';
}
//Spalte pflicht_sws in lehre.tbl_studienplan
if (!$result = @$db->db_query("SELECT pflicht_sws FROM lehre.tbl_studienplan LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN pflicht_sws integer;";
-
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienplan: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienplan: Spalte pflicht_sws hinzugefügt.
';
-
+ $qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN pflicht_sws integer;";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienplan: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan: Spalte pflicht_sws hinzugefügt.
';
}
//Spalte pflicht_lvs in lehre.tbl_studienplan
if (!$result = @$db->db_query("SELECT pflicht_lvs FROM lehre.tbl_studienplan LIMIT 1;"))
{
- $qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN pflicht_lvs integer;";
-
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienplan: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienplan: Spalte pflicht_lvs hinzugefügt.
';
-
+ $qry = "ALTER TABLE lehre.tbl_studienplan ADD COLUMN pflicht_lvs integer;";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienplan: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan: Spalte pflicht_lvs hinzugefügt.
';
}
// Tabelle Studienplan_Semester
-if (!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_studienplan_semester LIMIT 1;")) {
- $qry = "CREATE TABLE lehre.tbl_studienplan_semester
+if (!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_studienplan_semester LIMIT 1;"))
+{
+ $qry = "CREATE TABLE lehre.tbl_studienplan_semester
(
studienplan_semester_id integer NOT NULL,
studienplan_id integer NOT NULL,
@@ -765,15 +804,35 @@ if (!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_studienplan_semester LIMI
GRANT SELECT, UPDATE ON lehre.tbl_studienplan_semester_studienplan_semester_id TO vilesci;
";
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienplan_semester: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienplan_semester: Tabelle hinzugefuegt
';
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienplan_semester: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan_semester: Tabelle hinzugefuegt
';
+
+
+ $qry_select = "SELECT * from lehre.tbl_studienordnung_semester JOIN lehre.tbl_studienplan using(studienordnung_id);";
+ if($res_select = $db->db_query($qry_select))
+ {
+ $studienplan_semester_insert_error = false;
+ while($row = $db->db_fetch_object($res_select))
+ {
+ $qry_insert = "INSERT INTO lehre.tbl_studienplan_semester (studienplan_id, studiensemester_kurzbz, semester) VALUES (".$db->db_add_param($row->studienplan_id).",".$db->db_add_param($row->studiensemester_kurzbz).",".$db->db_add_param($row->semester, FHC_INTEGER).");";
+ if(!$db->db_query($qry_insert))
+ $studienplan_semester_insert_error = true;
+ }
+
+ if ($studienplan_semester_insert_error)
+ echo 'lehre.tbl_studienplan_semester Konvertierung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan_semester Konvertierung: abgeschlossen
';
+ }
+
}
//Tabelle public.tbl_bewerbungstermine
-if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_bewerbungstermine LIMIT 1;")) {
- $qry = "CREATE TABLE public.tbl_bewerbungstermine
+if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_bewerbungstermine LIMIT 1;"))
+{
+ $qry = "CREATE TABLE public.tbl_bewerbungstermine
(
bewerbungstermin_id integer NOT NULL,
studiengang_kz integer NOT NULL,
@@ -788,7 +847,7 @@ if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_bewerbungstermine LIMIT
updateamum timestamp,
updatevon varchar(32)
);
-
+
CREATE SEQUENCE public.tbl_bewerbungstermine_bewerbungstermin_id_seq
INCREMENT BY 1
NO MAXVALUE
@@ -805,39 +864,282 @@ if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_bewerbungstermine LIMIT
GRANT SELECT, UPDATE ON public.tbl_bewerbungstermine_bewerbungstermin_id_seq TO vilesci;
";
- if (!$db->db_query($qry))
- echo 'public.tbl_studienordnungstatus: ' . $db->db_last_error() . '
';
- else
- echo ' public.tbl_studienordnungstatus: Tabelle hinzugefuegt
';
+ if (!$db->db_query($qry))
+ echo 'public.tbl_bewerbungstermine: ' . $db->db_last_error() . '
';
+ else
+ echo ' public.tbl_bewerbungstermine: Tabelle hinzugefuegt
';
}
-//Tabelle lehre.tbl_studienordnungstatus
-if (!$result = @$db->db_query("SELECT 1 FROM lehre.tbl_studienordnungstatus LIMIT 1;")) {
- $qry = "CREATE TABLE lehre.tbl_studienordnungstatus
+//Tabelle lehre.tbl_studienplatz Spalte APZ
+if (!$result = @$db->db_query("SELECT APZ FROM lehre.tbl_studienplatz LIMIT 1;"))
+{
+ $qry = "ALTER TABLE lehre.tbl_studienplatz ADD COLUMN APZ integer;";
+
+ if(!$db->db_query($qry))
+ echo 'lehre.tbl_studienplatz '.$db->db_last_error().'
';
+ else
+ echo '
Spalte APZ in lehre.tbl_studienplatz hinzugefügt';
+}
+
+//Tabelle lehre.tbl_studienplatz Spalte studienplan_id
+if (!$result = @$db->db_query("SELECT studienplan_id FROM lehre.tbl_studienplatz LIMIT 1;"))
+{
+ $qry = "ALTER TABLE lehre.tbl_studienplatz ADD COLUMN studienplan_id integer;
+ ALTER TABLE lehre.tbl_studienplatz ADD CONSTRAINT fk_studienplatz_studienplan FOREIGN KEY (studienplan_id) REFERENCES lehre.tbl_studienplan (studienplan_id) ON DELETE RESTRICT ON UPDATE CASCADE;";
+
+ if(!$db->db_query($qry))
+ echo 'lehre.tbl_studienplatz '.$db->db_last_error().'
';
+ else
+ echo '
Spalte studienplan_id in lehre.tbl_studienplatz hinzugefügt';
+}
+
+
+//Tabelle lehre.tbl_studienplatz Spalte studienplan_id
+if ($result = @$db->db_query("SELECT studienplan_id FROM lehre.tbl_studienplatz WHERE studienplan_id IS NOT NULL;"))
+{
+ if(!$db->db_num_rows($result))
+ {
+ $result = @$db->db_query("SELECT studienplan_id FROM lehre.tbl_studienplatz WHERE studienplan_id IS NULL;");
+ $count = $db->db_num_rows($result);
+ echo "
Insgesamt $count zu bearbeitende Einträge in tbl_studienplatz gefunden
";
+
+ $qry = "
+ Select *,
(
- status_kurzbz varchar(32) NOT NULL,
- bezeichnung varchar(256),
- reihenfolge integer
- );
+ SELECT studienplan_id FROM lehre.tbl_studienplan
+ JOIN lehre.tbl_studienordnung using(studienordnung_id)
+ WHERE studiengang_kz=tbl_studienplatz.studiengang_kz
+ AND tbl_studienplan.orgform_kurzbz=tbl_studienplatz.orgform_kurzbz
+ AND EXISTS
+ (
+ SELECT 1 FROM lehre.tbl_studienordnung_semester
+ WHERE studienordnung_id=tbl_studienplan.studienordnung_id
+ AND studiensemester_kurzbz=tbl_studienplatz.studiensemester_kurzbz
+ ) lIMIT 1
+ ) as studienplan_id_neu
+ FROM lehre.tbl_studienplatz;
+ ";
- ALTER TABLE lehre.tbl_studienordnungstatus ADD CONSTRAINT pk_studienordnungstatus PRIMARY KEY (status_kurzbz);
+ if(!$result = $db->db_query($qry))
+ die('lehre.tbl_studienplatz '.$db->db_last_error().'
');
- GRANT SELECT ON lehre.tbl_studienordnungstatus TO web;
- GRANT SELECT, UPDATE, INSERT, DELETE ON lehre.tbl_studienordnungstatus TO vilesci;
-
- INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('development', 'in Bearbeitung', 1);
- INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('review', 'in Review', 2);
- INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('approved', 'genehmigt', 3);
- INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('expired', 'ausgelaufen', 4);
- INSERT INTO lehre.tbl_studienordnungstatus (status_kurzbz, bezeichnung, reihenfolge) VALUES ('notApproved', 'nicht genehmigt', 5);
+ $count_not_found = 0;
+
+ while($row = $db->db_fetch_object($result))
+ {
+ //handle null
+ if($row->studienplan_id_neu !== null)
+ {
+ //look if found the studienplan exists
+ $qry_search = "
+ SELECT *
+ FROM lehre.tbl_studienplan
+ WHERE studienplan_id=".$db->db_add_param($row->studienplan_id_neu, FHC_INTEGER).";";
+
+ if($result_search = $db->db_query($qry_search))
+ {
+ $tmpFoundRows = $db->db_num_rows($result_search);
+ if($tmpFoundRows == 1)
+ {
+ //one entry found (=success)
+ $qry_update = "UPDATE lehre.tbl_studienplatz SET studienplan_id = ".$db->db_add_param($row->studienplan_id_neu, FHC_INTEGER)."
+ WHERE studienplatz_id=".$db->db_add_param($row->studienplatz_id, FHC_INTEGER).";";
+
+ if($result_update = $db->db_query($qry_update))
+ {
+ continue;
+ }
+ echo "" . $row->studienplan_id_neu . ": fehler beim update!
";
+ }
+ else if($tmpFoundRows < 1)
+ {
+ echo "" . $row->studienplan_id_neu . " nicht gefunden!
";
+ }
+ else
+ {
+ echo "" . $row->studienplan_id_neu . " gibt es mehr als ein mal!
";
+ }
+ }
+ }
+
+ $count_not_found ++;
+ }
+
+
+ //calculate the quote
+ if($count_not_found)
+ $quote = ($count_not_found)/$count*100;
+ else
+ $quote = 0;
+ echo "unbehandelte: " . $count_not_found . "
";
+ echo "Die Quote beträgt: " . (100-round($quote, 4)) . "%
";
+
+
+ $qry_updated = "SELECT * FROM lehre.tbl_studienplatz WHERE studienplan_id IS NOT NULL;";
+ if($result_updated = $db->db_query($qry_updated))
+ {
+ while($row = $db->db_fetch_object($result_updated))
+ echo "Für STG $row->studiengang_kz wurde studienplan_id $row->studienplan_id eingesetzt
";
+ }
+ }
+}
+
+
+
+//Tabelle bis.tbl_zgvgruppe
+if (!$result = @$db->db_query("SELECT 1 FROM bis.tbl_zgvgruppe LIMIT 1;"))
+{
+ $qry = "
+ CREATE TABLE bis.tbl_zgvgruppe
+ (
+ gruppe_kurzbz varchar(16),
+ bezeichnung varchar(256)
+ );
+
+ ALTER TABLE bis.tbl_zgvgruppe ADD CONSTRAINT uk_zgvgruppe_gruppe_kurzbz UNIQUE (gruppe_kurzbz);
+
+ GRANT SELECT ON bis.tbl_zgvgruppe TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_zgvgruppe TO vilesci;
";
- if (!$db->db_query($qry))
- echo 'lehre.tbl_studienordnungstatus: ' . $db->db_last_error() . '
';
- else
- echo ' lehre.tbl_studienordnungstatus: Tabelle hinzugefuegt
';
+ if (!$db->db_query($qry))
+ echo 'bis.tbl_zgvgruppe: ' . $db->db_last_error() . '
';
+ else
+ echo 'bis.tbl_zgvgruppe: Tabelle hinzugefuegt
';
}
+
+
+//Tabelle bis.tbl_zgvgruppe_zuordnung
+if (!$result = @$db->db_query("SELECT 1 FROM bis.tbl_zgvgruppe_zuordnung LIMIT 1;"))
+{
+ $qry = "
+ CREATE TABLE bis.tbl_zgvgruppe_zuordnung
+ (
+ zgvgruppe_id integer NOT NULL,
+ studiengang_kz integer,
+ zgv_code integer,
+ zgvmas_code integer,
+ gruppe_kurzbz varchar(16)
+ );
+
+ CREATE SEQUENCE bis.tbl_zgvgruppe_zuordnung_zgvgruppe_id_seq
+ INCREMENT BY 1
+ NO MAXVALUE
+ NO MINVALUE
+ CACHE 1;
+
+ ALTER TABLE bis.tbl_zgvgruppe_zuordnung ALTER COLUMN zgvgruppe_id SET DEFAULT nextval('bis.tbl_zgvgruppe_zuordnung_zgvgruppe_id_seq');
+ ALTER TABLE bis.tbl_zgvgruppe_zuordnung ADD CONSTRAINT pk_zgvgruppe_id PRIMARY KEY (zgvgruppe_id);
+
+ ALTER TABLE bis.tbl_zgvgruppe_zuordnung ADD CONSTRAINT fk_zgvgruppe_zuordnung_studiengang FOREIGN KEY (studiengang_kz) REFERENCES public.tbl_studiengang (studiengang_kz) ON DELETE RESTRICT ON UPDATE CASCADE;
+ ALTER TABLE bis.tbl_zgvgruppe_zuordnung ADD CONSTRAINT fk_zgvgruppe_zuordnung_zgv FOREIGN KEY (zgv_code) REFERENCES bis.tbl_zgv (zgv_code) ON DELETE RESTRICT ON UPDATE CASCADE;
+ ALTER TABLE bis.tbl_zgvgruppe_zuordnung ADD CONSTRAINT fk_zgvgruppe_zuordnung_zgvmaster FOREIGN KEY (zgvmas_code) REFERENCES bis.tbl_zgvmaster (zgvmas_code) ON DELETE RESTRICT ON UPDATE CASCADE;
+ ALTER TABLE bis.tbl_zgvgruppe_zuordnung ADD CONSTRAINT fk_zgvgruppe_zuordnung_zgvgruppe FOREIGN KEY (gruppe_kurzbz) REFERENCES bis.tbl_zgvgruppe (gruppe_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ GRANT SELECT ON bis.tbl_zgvgruppe_zuordnung TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_zgvgruppe_zuordnung TO vilesci;
+ GRANT SELECT, UPDATE ON bis.tbl_zgvgruppe_zuordnung_zgvgruppe_id_seq TO vilesci;
+ ";
+
+ if (!$db->db_query($qry))
+ echo 'bis.tbl_zgvgruppe_zuordnung: ' . $db->db_last_error() . '
';
+ else
+ echo 'bis.tbl_zgvgruppe_zuordnung: Tabelle hinzugefuegt
';
+}
+
+
+// Neue Spalte anzahl_ma bei fue.tbl_projekt
+if(!@$db->db_query("SELECT anzahl_ma FROM fue.tbl_projekt LIMIT 1"))
+{
+ $qry = "
+ ALTER TABLE fue.tbl_projekt ADD COLUMN anzahl_ma integer;
+ ";
+
+ if(!$db->db_query($qry))
+ echo 'fue.tbl_projekt '.$db->db_last_error().'
';
+ else
+ echo '
Spalte anzahl_ma in fue.tbl_projekt hinzugefügt';
+}
+
+
+// Neue Spalte aufwand_pt bei fue.tbl_projekt
+if(!@$db->db_query("SELECT aufwand_pt FROM fue.tbl_projekt LIMIT 1"))
+{
+ $qry = "
+ ALTER TABLE fue.tbl_projekt ADD COLUMN aufwand_pt integer;
+ ";
+
+ if(!$db->db_query($qry))
+ echo 'fue.tbl_projekt '.$db->db_last_error().'
';
+ else
+ echo '
Spalte aufwand_pt in fue.tbl_projekt hinzugefügt';
+}
+
+//Tabelle public.tbl_studienjahr
+if (!$result = @$db->db_query("SELECT 1 FROM public.tbl_studienjahr LIMIT 1;"))
+{
+ $qry = "
+ CREATE TABLE public.tbl_studienjahr
+ (
+ studienjahr_kurzbz varchar(16) NOT NULL,
+ bezeichnung varchar(64)
+
+ );
+
+ ALTER TABLE public.tbl_studienjahr ADD CONSTRAINT pk_studienjahr_kurzbz PRIMARY KEY (studienjahr_kurzbz);
+
+ INSERT INTO public.tbl_studienjahr (studienjahr_kurzbz) SELECT DISTINCT s.studienjahr_kurzbz FROM public.tbl_studiensemester s WHERE s.studienjahr_kurzbz is not null;
+
+ ALTER TABLE public.tbl_studiensemester ADD CONSTRAINT fk_studiensemester_studienjahr FOREIGN KEY (studienjahr_kurzbz) REFERENCES public.tbl_studienjahr (studienjahr_kurzbz) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ GRANT SELECT ON public.tbl_studienjahr TO web;
+ GRANT SELECT, UPDATE, INSERT, DELETE ON public.tbl_studienjahr TO vilesci;
+ ";
+
+ if (!$db->db_query($qry))
+ echo 'public.tbl_studienjahr: ' . $db->db_last_error() . '
';
+ else
+ echo 'public.tbl_studienjahr: Tabelle hinzugefuegt
';
+}
+
+//Spalte genehmigung in lehre.tbl_studienordnung_lehrveranstaltung
+if (!$result = @$db->db_query("SELECT genehmigung FROM lehre.tbl_studienplan_lehrveranstaltung LIMIT 1;"))
+{
+ $qry = "ALTER TABLE lehre.tbl_studienplan_lehrveranstaltung ADD COLUMN genehmigung BOOLEAN DEFAULT TRUE;";
+
+ if (!$db->db_query($qry))
+ echo 'lehre.tbl_studienplan_lehrveranstaltung: ' . $db->db_last_error() . '
';
+ else
+ echo ' lehre.tbl_studienplan_lehrveranstaltung: Spalte genehmigung hinzugefügt.
';
+}
+
+//Spalte pruefungstyp_kurzbz in campus.tbl_pruefungsanmeldung
+if (!$result = @$db->db_query("SELECT pruefungstyp_kurzbz FROM campus.tbl_pruefungsanmeldung LIMIT 1;"))
+{
+ $qry = "ALTER TABLE campus.tbl_pruefungsanmeldung ADD COLUMN pruefungstyp_kurzbz varchar(16);
+ ALTER TABLE campus.tbl_pruefungsanmeldung ADD CONSTRAINT fk_pruefungsanmeldung_pruefungstyp_pruefungstyp_kurzbz FOREIGN KEY (pruefungstyp_kurzbz) REFERENCES lehre.tbl_pruefungstyp(pruefungstyp_kurzbz) ON DELETE CASCADE ON UPDATE CASCADE;";
+
+ if (!$db->db_query($qry))
+ echo 'campus.tbl_pruefungsanmeldung: ' . $db->db_last_error() . '
';
+ else
+ echo ' campus.tbl_pruefungsanmeldung: Spalte pruefungstyp_kurzbz hinzugefügt.
';
+}
+
+// Neue Spalte bezeichnung_mehrsprachig bei tbl_status
+if(!@$db->db_query("SELECT bezeichnung_mehrsprachig FROM public.tbl_status LIMIT 1"))
+{
+ $qry = " ALTER TABLE public.tbl_status ADD COLUMN bezeichnung_mehrsprachig varchar(255)[];
+ update tbl_status set bezeichnung_mehrsprachig = cast('{'||status_kurzbz||','||status_kurzbz||'}' as varchar[]);";
+
+
+ if(!$db->db_query($qry))
+ echo 'public.tbl_status '.$db->db_last_error().'
';
+ else
+ echo '
Spalte bezeichnung_mehrsprachig in public.tbl_status hinzugefügt
Die ersten beiden Sprachen wurden vorbefüllt. Weitere Übersetzungen sind zu ergänzen!
';
+}
+
+
// *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
echo 'Pruefe Tabellen und Attribute!
';
@@ -868,6 +1170,8 @@ $tabellen=array(
"bis.tbl_zgvmaster" => array("zgvmas_code","zgvmas_bez","zgvmas_kurzbz","bezeichnung"),
"bis.tbl_zgvdoktor" => array("zgvdoktor_code", "zgvdoktor_bez", "zgvdoktor_kurzbz","bezeichnung"),
"bis.tbl_zweck" => array("zweck_code","kurzbz","bezeichnung"),
+ "bis.tbl_zgvgruppe" => array("gruppe_kurzbz","bezeichnung"),
+ "bis.tbl_zgvgruppe_zuordnung" => array("zgvgruppe_id" ,"studiengang_kz","zgv_code","zgvmas_code","gruppe_kurzbz"),
"campus.tbl_abgabe" => array("abgabe_id","abgabedatei","abgabezeit","anmerkung"),
"campus.tbl_anwesenheit" => array("anwesenheit_id","uid","einheiten","datum","anwesend","lehreinheit_id","anmerkung","ext_id"),
"campus.tbl_beispiel" => array("beispiel_id","uebung_id","nummer","bezeichnung","punkte","updateamum","updatevon","insertamum","insertvon"),
@@ -922,7 +1226,7 @@ $tabellen=array(
"campus.tbl_zeitwunsch" => array("stunde","mitarbeiter_uid","tag","gewicht","updateamum","updatevon","insertamum","insertvon"),
"fue.tbl_aktivitaet" => array("aktivitaet_kurzbz","beschreibung","sort"),
"fue.tbl_aufwandstyp" => array("aufwandstyp_kurzbz","bezeichnung"),
- "fue.tbl_projekt" => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz","budget","farbe","aufwandstyp_kurzbz","ressource_id"),
+ "fue.tbl_projekt" => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz","budget","farbe","aufwandstyp_kurzbz","ressource_id","anzahl_ma","aufwand_pt"),
"fue.tbl_projektphase" => array("projektphase_id","projekt_kurzbz","projektphase_fk","bezeichnung","typ","beschreibung","start","ende","budget","insertamum","insertvon","updateamum","updatevon","personentage","farbe","ressource_id"),
"fue.tbl_projekttask" => array("projekttask_id","projektphase_id","bezeichnung","beschreibung","aufwand","mantis_id","insertamum","insertvon","updateamum","updatevon","projekttask_fk","erledigt","ende","ressource_id","scrumsprint_id"),
"fue.tbl_projekt_dokument" => array("projekt_dokument_id","projektphase_id","projekt_kurzbz","dms_id"),
@@ -951,7 +1255,7 @@ $tabellen=array(
"lehre.tbl_lehrfunktion" => array("lehrfunktion_kurzbz","beschreibung","standardfaktor","sort"),
"lehre.tbl_lehrmittel" => array("lehrmittel_kurzbz","beschreibung","ort_kurzbz"),
"lehre.tbl_lehrtyp" => array("lehrtyp_kurzbz","bezeichnung"),
- "lehre.tbl_lehrveranstaltung" => array("lehrveranstaltung_id","kurzbz","bezeichnung","lehrform_kurzbz","studiengang_kz","semester","sprache","ects","semesterstunden","anmerkung","lehre","lehreverzeichnis","aktiv","planfaktor","planlektoren","planpersonalkosten","plankostenprolektor","koordinator","sort","zeugnis","projektarbeit","updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung_english","orgform_kurzbz","incoming","lehrtyp_kurzbz","oe_kurzbz","raumtyp_kurzbz","anzahlsemester","semesterwochen","lvnr","farbe","semester_alternativ","old_lehrfach_id","sws","lvs","alvs","lvps","las","benotung","lvinfo"),
+ "lehre.tbl_lehrveranstaltung" => array("lehrveranstaltung_id","kurzbz","bezeichnung","lehrform_kurzbz","studiengang_kz","semester","sprache","ects","semesterstunden","anmerkung","lehre","lehreverzeichnis","aktiv","planfaktor","planlektoren","planpersonalkosten","plankostenprolektor","koordinator","sort","zeugnis","projektarbeit","updateamum","updatevon","insertamum","insertvon","ext_id","bezeichnung_english","orgform_kurzbz","incoming","lehrtyp_kurzbz","oe_kurzbz","raumtyp_kurzbz","anzahlsemester","semesterwochen","lvnr","farbe","semester_alternativ","old_lehrfach_id","sws","lvs","alvs","lvps","las","benotung","lvinfo","lehrauftrag"),
"lehre.tbl_lehrveranstaltung_kompatibel" => array("lehrveranstaltung_id","lehrveranstaltung_id_kompatibel"),
"lehre.tbl_lvangebot" => array("lvangebot_id","lehrveranstaltung_id","studiensemester_kurzbz","gruppe_kurzbz","incomingplaetze","gesamtplaetze","anmeldefenster_start","anmeldefenster_ende","insertamum","insertvon","updateamum","updatevon"),
"lehre.tbl_lvregel" => array("lvregel_id","lvregeltyp_kurzbz","operator","parameter","lvregel_id_parent","lehrveranstaltung_id","studienplan_lehrveranstaltung_id","insertamum","insertvon","updateamum","updatevon"),
@@ -968,12 +1272,12 @@ $tabellen=array(
"lehre.tbl_pruefung" => array("pruefung_id","lehreinheit_id","student_uid","mitarbeiter_uid","note","pruefungstyp_kurzbz","datum","anmerkung","insertamum","insertvon","updateamum","updatevon","ext_id","pruefungsanmeldung_id","vertrag_id", "punkte"),
"lehre.tbl_pruefungstyp" => array("pruefungstyp_kurzbz","beschreibung","abschluss"),
"lehre.tbl_studienordnung" => array("studienordnung_id","studiengang_kz","version","gueltigvon","gueltigbis","bezeichnung","ects","studiengangbezeichnung","studiengangbezeichnung_englisch","studiengangkurzbzlang","akadgrad_id","insertamum","insertvon","updateamum","updatevon","ext_id", "status_kurzbz", "standort_id"),
- "lehre.tbl_studienordnungstatus" => array("status_kurzbz","bezeichnung","reihenfolge"),
+ "lehre.tbl_studienordnungstatus" => array("status_kurzbz","bezeichnung","reihenfolge"),
"lehre.tbl_studienordnung_semester" => array("studienordnung_semester_id","studienordnung_id","studiensemester_kurzbz","semester"),
"lehre.tbl_studienplan" => array("studienplan_id","studienordnung_id","orgform_kurzbz","version","regelstudiendauer","sprache","aktiv","bezeichnung","insertamum","insertvon","updateamum","updatevon","semesterwochen","testtool_sprachwahl","ext_id", "ects_stpl", "pflicht_sws", "pflicht_lvs"),
- "lehre.tbl_studienplan_lehrveranstaltung" => array("studienplan_lehrveranstaltung_id","studienplan_id","lehrveranstaltung_id","semester","studienplan_lehrveranstaltung_id_parent","pflicht","koordinator","insertamum","insertvon","updateamum","updatevon","sort","ext_id", "curriculum"),
- "lehre.tbl_studienplan_semester" => array("studienplan_semester_id", "studienplan_id", "studiensemester_kurzbz", "semester"),
- "lehre.tbl_studienplatz" => array("studienplatz_id","studiengang_kz","studiensemester_kurzbz","orgform_kurzbz","ausbildungssemester","gpz","npz","insertamum","insertvon","updateamum","updatevon","ext_id"),
+ "lehre.tbl_studienplan_lehrveranstaltung" => array("studienplan_lehrveranstaltung_id","studienplan_id","lehrveranstaltung_id","semester","studienplan_lehrveranstaltung_id_parent","pflicht","koordinator","insertamum","insertvon","updateamum","updatevon","sort","ext_id", "curriculum","export","genehmigung"),
+ "lehre.tbl_studienplan_semester" => array("studienplan_semester_id", "studienplan_id", "studiensemester_kurzbz", "semester"),
+ "lehre.tbl_studienplatz" => array("studienplatz_id","studiengang_kz","studiensemester_kurzbz","orgform_kurzbz","ausbildungssemester","gpz","npz","insertamum","insertvon","updateamum","updatevon","ext_id", "apz", "studienplan_id"),
"lehre.tbl_stunde" => array("stunde","beginn","ende"),
"lehre.tbl_stundenplan" => array("stundenplan_id","unr","mitarbeiter_uid","datum","stunde","ort_kurzbz","gruppe_kurzbz","titel","anmerkung","lehreinheit_id","studiengang_kz","semester","verband","gruppe","fix","updateamum","updatevon","insertamum","insertvon"),
"lehre.tbl_stundenplandev" => array("stundenplandev_id","lehreinheit_id","unr","studiengang_kz","semester","verband","gruppe","gruppe_kurzbz","mitarbeiter_uid","ort_kurzbz","datum","stunde","titel","anmerkung","fix","updateamum","updatevon","insertamum","insertvon","ext_id"),
@@ -1044,7 +1348,7 @@ $tabellen=array(
"public.tbl_prestudentstatus" => array("prestudent_id","status_kurzbz","studiensemester_kurzbz","ausbildungssemester","datum","orgform_kurzbz","insertamum","insertvon","updateamum","updatevon","ext_id","studienplan_id","bestaetigtam","bestaetigtvon","fgm","faktiv", "anmerkung","bewerbung_abgeschicktamum"),
"public.tbl_raumtyp" => array("raumtyp_kurzbz","beschreibung","kosten"),
"public.tbl_reihungstest" => array("reihungstest_id","studiengang_kz","ort_kurzbz","anmerkung","datum","uhrzeit","updateamum","updatevon","insertamum","insertvon","ext_id","freigeschaltet","max_teilnehmer","oeffentlich","studiensemester_kurzbz"),
- "public.tbl_status" => array("status_kurzbz","beschreibung","anmerkung","ext_id"),
+ "public.tbl_status" => array("status_kurzbz","beschreibung","anmerkung","ext_id","bezeichnung_mehrsprachig"),
"public.tbl_semesterwochen" => array("semester","studiengang_kz","wochen"),
"public.tbl_service" => array("service_id", "bezeichnung","beschreibung","ext_id","oe_kurzbz","content_id"),
"public.tbl_sprache" => array("sprache","locale","flagge","index","content","bezeichnung"),
@@ -1054,6 +1358,7 @@ $tabellen=array(
"public.tbl_studentlehrverband" => array("student_uid","studiensemester_kurzbz","studiengang_kz","semester","verband","gruppe","updateamum","updatevon","insertamum","insertvon","ext_id"),
"public.tbl_studiengang" => array("studiengang_kz","kurzbz","kurzbzlang","typ","bezeichnung","english","farbe","email","telefon","max_semester","max_verband","max_gruppe","erhalter_kz","bescheid","bescheidbgbl1","bescheidbgbl2","bescheidgz","bescheidvom","orgform_kurzbz","titelbescheidvom","aktiv","ext_id","zusatzinfo_html","moodle","sprache","testtool_sprachwahl","studienplaetze","oe_kurzbz","lgartcode","mischform","projektarbeit_note_anzeige", "onlinebewerbung"),
"public.tbl_studiengangstyp" => array("typ","bezeichnung","beschreibung"),
+ "public.tbl_studienjahr" => array("studienjahr_kurzbz","bezeichnung"),
"public.tbl_studiensemester" => array("studiensemester_kurzbz","bezeichnung","start","ende","studienjahr_kurzbz","ext_id","beschreibung","onlinebewerbung"),
"public.tbl_tag" => array("tag"),
"public.tbl_variable" => array("name","uid","wert"),
diff --git a/system/fhcomplete3.0.sql b/system/fhcomplete3.0.sql
index 4483ab4dc..36d6520b0 100644
--- a/system/fhcomplete3.0.sql
+++ b/system/fhcomplete3.0.sql
@@ -26,7 +26,7 @@ SET escape_string_warning = off;
-- Name: bis; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA bis;
+CREATE SCHEMA IF NOT EXISTS bis;
ALTER SCHEMA bis OWNER TO fhcomplete;
@@ -35,7 +35,7 @@ ALTER SCHEMA bis OWNER TO fhcomplete;
-- Name: campus; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA campus;
+CREATE SCHEMA IF NOT EXISTS campus;
ALTER SCHEMA campus OWNER TO fhcomplete;
@@ -44,7 +44,7 @@ ALTER SCHEMA campus OWNER TO fhcomplete;
-- Name: fue; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA fue;
+CREATE SCHEMA IF NOT EXISTS fue;
ALTER SCHEMA fue OWNER TO fhcomplete;
@@ -53,7 +53,7 @@ ALTER SCHEMA fue OWNER TO fhcomplete;
-- Name: kommune; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA kommune;
+CREATE SCHEMA IF NOT EXISTS kommune;
ALTER SCHEMA kommune OWNER TO fhcomplete;
@@ -62,7 +62,7 @@ ALTER SCHEMA kommune OWNER TO fhcomplete;
-- Name: lehre; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA lehre;
+CREATE SCHEMA IF NOT EXISTS lehre;
ALTER SCHEMA lehre OWNER TO fhcomplete;
@@ -71,7 +71,7 @@ ALTER SCHEMA lehre OWNER TO fhcomplete;
-- Name: sync; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA sync;
+CREATE SCHEMA IF NOT EXISTS sync;
ALTER SCHEMA sync OWNER TO fhcomplete;
@@ -87,7 +87,7 @@ COMMENT ON SCHEMA sync IS 'Schema zum Synchronisieren von Daten';
-- Name: system; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA system;
+CREATE SCHEMA IF NOT EXISTS system;
ALTER SCHEMA system OWNER TO fhcomplete;
@@ -96,7 +96,7 @@ ALTER SCHEMA system OWNER TO fhcomplete;
-- Name: testtool; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA testtool;
+CREATE SCHEMA IF NOT EXISTS testtool;
ALTER SCHEMA testtool OWNER TO fhcomplete;
@@ -105,7 +105,7 @@ ALTER SCHEMA testtool OWNER TO fhcomplete;
-- Name: wawi; Type: SCHEMA; Schema: -; Owner: postgres
--
-CREATE SCHEMA wawi;
+CREATE SCHEMA IF NOT EXISTS wawi;
ALTER SCHEMA wawi OWNER TO fhcomplete;
@@ -31054,7 +31054,7 @@ INSERT INTO tbl_lehrverband VALUES (2, 4, 'B', '2', true, '', NULL, NULL, 50071)
-- Data for Name: tbl_mitarbeiter; Type: TABLE DATA; Schema: public; Owner: postgres
--
-INSERT INTO tbl_mitarbeiter VALUES ('administrator', 1213, NULL, 'Admin', true, false, NULL, NULL, NULL, NULL, NULL, '2013-06-04 16:51:25.448077', 'auto', NULL, NULL, false, NULL);
+INSERT INTO tbl_mitarbeiter VALUES ('admin', 1213, NULL, 'Admin', true, false, NULL, NULL, NULL, NULL, NULL, '2013-06-04 16:51:25.448077', 'auto', NULL, NULL, false, NULL);
INSERT INTO tbl_mitarbeiter VALUES ('_DummyLektor', 1214, NULL, 'Dummy', true, false, NULL, NULL, NULL, NULL, NULL, '2013-08-06 07:41:48.894325', 'auto', NULL, NULL, false, NULL);
@@ -36090,7 +36090,7 @@ SET search_path = system, pg_catalog;
-- Data for Name: tbl_benutzerrolle; Type: TABLE DATA; Schema: system; Owner: postgres
--
-INSERT INTO tbl_benutzerrolle VALUES (1, 'admin', NULL, 'administrator', NULL, 'etw', 'suid', NULL, NULL, NULL, false, NULL, NULL, '2013-06-04 17:09:29.321309', NULL, NULL);
+INSERT INTO tbl_benutzerrolle VALUES (1, 'admin', NULL, 'admin', NULL, 'etw', 'suid', NULL, NULL, NULL, false, NULL, NULL, '2013-06-04 17:09:29.321309', NULL, NULL);
--
diff --git a/tests/codeception/_data/dump.sql b/tests/codeception/_data/dump.sql
index dd20b810f..8cebb7f53 100644
--- a/tests/codeception/_data/dump.sql
+++ b/tests/codeception/_data/dump.sql
@@ -1,6 +1,131 @@
-- EMPTY public.tbl_person
DELETE FROM public.tbl_person WHERE person_id > 2;
-- INSERT Persons (public.tbl_person)
+INSERT INTO public.tbl_person VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Vicenta', 'Abraham', '2002-12-30', 'Brooksburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.624239', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '4ffd30cc58718', false);
+INSERT INTO public.tbl_person VALUES (4, NULL, NULL, NULL, NULL, NULL, NULL, 'Wilderman', 'Rocio', 'Jayson', '2002-09-03', 'Hermannshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.632551', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'bd94ef5d5a', false);
+INSERT INTO public.tbl_person VALUES (5, NULL, NULL, NULL, NULL, NULL, NULL, 'Harvey', 'Joshuah', 'Halie', '1930-01-18', 'Mitchellville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.634179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (6, NULL, NULL, NULL, NULL, NULL, NULL, 'Kessler', 'Neil', 'Dashawn', '1948-06-10', 'Anitafort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.63728', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (7, NULL, NULL, NULL, NULL, NULL, NULL, 'Little', 'Marvin', 'Hassie', '1933-11-14', 'Chayatown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.641078', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (8, NULL, NULL, NULL, NULL, NULL, NULL, 'Hamill', 'Roselyn', 'Retha', '1931-05-16', 'Horacioview', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.644311', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (9, NULL, NULL, NULL, NULL, NULL, NULL, 'Hartmann', 'Marcel', 'Porter', '1948-01-07', 'Lake Eulaliaborough', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.647474', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (10, NULL, NULL, NULL, NULL, NULL, NULL, 'Rice', 'Hilda', 'Gerson', '1950-07-04', 'Louveniahaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.650108', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (11, NULL, NULL, NULL, NULL, NULL, NULL, 'Wisozk', 'Bethel', 'Watson', '2009-08-27', 'Leuschkemouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.652681', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (12, NULL, NULL, NULL, NULL, NULL, NULL, 'Wisozk', 'Flavio', 'Valentin', '1979-05-25', 'Cindyville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.655173', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (13, NULL, NULL, NULL, NULL, NULL, NULL, 'Graham', 'Francisca', 'Camron', '1953-05-08', 'North Furman', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.657715', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (14, NULL, NULL, NULL, NULL, NULL, NULL, 'Baumbach', 'Nickolas', 'Sherman', '1988-12-10', 'New Breana', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.659352', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (15, NULL, NULL, NULL, NULL, NULL, NULL, 'Stiedemann', 'Alexandre', 'Era', '1935-04-26', 'Robynland', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.660843', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (16, NULL, NULL, NULL, NULL, NULL, NULL, 'Koss', 'Stuart', 'Onie', '2013-10-07', 'Mauriceville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.662338', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (17, NULL, NULL, NULL, NULL, NULL, NULL, 'Conroy', 'Royce', 'Ollie', '1948-05-10', 'Lake Derick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.663905', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (18, NULL, NULL, NULL, NULL, NULL, NULL, 'Hand', 'Stuart', 'Adonis', '2008-11-26', 'Schimmelville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.665442', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (19, NULL, NULL, NULL, NULL, NULL, NULL, 'Howell', 'Delmer', 'Vance', '1944-04-19', 'New Ritaville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.667043', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (20, NULL, NULL, NULL, NULL, NULL, NULL, 'Towne', 'Nikita', 'Devin', '2004-12-30', 'Lindshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.668476', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (21, NULL, NULL, NULL, NULL, NULL, NULL, 'Reynolds', 'Oran', 'Gennaro', '2013-04-13', 'Aliciafort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.670087', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (22, NULL, NULL, NULL, NULL, NULL, NULL, 'Quitzon', 'Billie', 'Dagmar', '2015-01-07', 'Blickstad', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.673039', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (23, NULL, NULL, NULL, NULL, NULL, NULL, 'Wisoky', 'Lonnie', 'Stacey', '1957-11-25', 'Lake Carolyn', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.676088', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (24, NULL, NULL, NULL, NULL, NULL, NULL, 'Gottlieb', 'Marianna', 'Lesley', '2005-04-13', 'Jacobsonport', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.679072', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (25, NULL, NULL, NULL, NULL, NULL, NULL, 'Schuster', 'Terrell', 'Jordy', '1917-06-10', 'Monicaport', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.682185', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (26, NULL, NULL, NULL, NULL, NULL, NULL, 'Reilly', 'Sadye', 'Trever', '1988-03-06', 'Port Lesly', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.684774', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (27, NULL, NULL, NULL, NULL, NULL, NULL, 'Langosh', 'Scarlett', 'Madie', '1959-04-20', 'Jewelside', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.687341', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (28, NULL, NULL, NULL, NULL, NULL, NULL, 'Paucek', 'Will', 'Lester', '1982-02-19', 'South Patience', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.831546', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (29, NULL, NULL, NULL, NULL, NULL, NULL, 'Champlin', 'Tamia', 'Shayne', '1996-06-05', 'Nathanielmouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.835765', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (30, NULL, NULL, NULL, NULL, NULL, NULL, 'Collier', 'Robyn', 'Dana', '2015-04-04', 'Gleichnerhaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.837262', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (31, NULL, NULL, NULL, NULL, NULL, NULL, 'Kassulke', 'Eleonore', 'Monty', '1941-08-14', 'West Joport', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.838802', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (32, NULL, NULL, NULL, NULL, NULL, NULL, 'Sauer', 'Danial', 'Deon', '1951-01-28', 'West Jovannyfurt', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.841786', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (33, NULL, NULL, NULL, NULL, NULL, NULL, 'Volkman', 'Jaycee', 'Nola', '1998-09-30', 'North Joany', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.84491', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (34, NULL, NULL, NULL, NULL, NULL, NULL, 'Blanda', 'Margarett', 'Foster', '1972-06-04', 'Lake Roger', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.848049', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (35, NULL, NULL, NULL, NULL, NULL, NULL, 'Stamm', 'Eduardo', 'Elton', '1991-12-08', 'West Laverna', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.851258', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (36, NULL, NULL, NULL, NULL, NULL, NULL, 'Ratke', 'Name', 'Mellie', '1947-09-06', 'East Terrance', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.853933', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (37, NULL, NULL, NULL, NULL, NULL, NULL, 'Brakus', 'Consuelo', 'Fabian', '1978-04-16', 'Mistyville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.85665', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (38, NULL, NULL, NULL, NULL, NULL, NULL, 'Bode', 'Brianne', 'Yesenia', '1921-02-27', 'Port Antwanview', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.859328', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (39, NULL, NULL, NULL, NULL, NULL, NULL, 'Schmidt', 'Jaiden', 'Greyson', '1997-06-30', 'Othofort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.862145', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (40, NULL, NULL, NULL, NULL, NULL, NULL, 'Lemke', 'Cooper', 'Eliane', '1990-12-18', 'North Brodychester', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.863992', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (41, NULL, NULL, NULL, NULL, NULL, NULL, 'Doyle', 'Gerhard', 'Birdie', '1932-07-23', 'West Marcia', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.86628', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (42, NULL, NULL, NULL, NULL, NULL, NULL, 'Macejkovic', 'Jermain', 'Sophie', '1941-08-08', 'Leoraburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.869542', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (43, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Alisa', 'Jaclyn', '1967-11-14', 'Port Hillaryhaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.871741', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (44, NULL, NULL, NULL, NULL, NULL, NULL, 'Kling', 'Hailie', 'Brayan', '1967-04-26', 'Lake Hopetown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.873744', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (45, NULL, NULL, NULL, NULL, NULL, NULL, 'Lebsack', 'Bo', 'Arno', '1988-08-19', 'Alexandreamouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.875473', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (46, NULL, NULL, NULL, NULL, NULL, NULL, 'Grant', 'Stacey', 'Magnolia', '1978-11-17', 'Lake Sonya', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.877099', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (47, NULL, NULL, NULL, NULL, NULL, NULL, 'Daniel', 'Nels', 'Guy', '1925-11-09', 'North Palma', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.878715', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (48, NULL, NULL, NULL, NULL, NULL, NULL, 'Veum', 'Rey', 'Candelario', '1989-12-10', 'Calliemouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.881668', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (49, NULL, NULL, NULL, NULL, NULL, NULL, 'Stokes', 'Berniece', 'Noel', '1938-11-24', 'Hamillhaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.884717', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (50, NULL, NULL, NULL, NULL, NULL, NULL, 'Haley', 'Mustafa', 'Hyman', '1973-09-19', 'East Allie', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.887636', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (51, NULL, NULL, NULL, NULL, NULL, NULL, 'Harris', 'Diana', 'Lilly', '1920-05-20', 'Lempiberg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.890715', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (52, NULL, NULL, NULL, NULL, NULL, NULL, 'Kovacek', 'Nya', 'Chesley', '1990-03-11', 'Goldnerland', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 16:03:08.89322', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (53, NULL, NULL, NULL, NULL, NULL, NULL, 'Dibbert', 'Tad', 'Neil', '1974-04-09', 'East Eunaland', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:11:56.824758', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (54, NULL, NULL, NULL, NULL, NULL, NULL, 'Batz', 'Ceasar', 'Janie', '1924-09-30', 'West Laurenfort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.722855', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (55, NULL, NULL, NULL, NULL, NULL, NULL, 'Boyer', 'Amely', 'Joelle', '1998-01-18', 'Port Odell', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.727985', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (56, NULL, NULL, NULL, NULL, NULL, NULL, 'Hand', 'Walker', 'Francisca', '1926-12-21', 'Rozellahaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.731695', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (57, NULL, NULL, NULL, NULL, NULL, NULL, 'Zulauf', 'Juana', 'Hermann', '1949-06-30', 'Lake Lawsontown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.735121', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (58, NULL, NULL, NULL, NULL, NULL, NULL, 'Becker', 'Dennis', 'Madilyn', '1995-07-20', 'Alyceberg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.738065', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (59, NULL, NULL, NULL, NULL, NULL, NULL, 'Hauck', 'German', 'Frederic', '1947-02-03', 'Lake Jordonfort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.740693', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (60, NULL, NULL, NULL, NULL, NULL, NULL, 'Erdman', 'Tyreek', 'Robyn', '1949-07-17', 'Jacobsonborough', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.742964', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (61, NULL, NULL, NULL, NULL, NULL, NULL, 'Considine', 'Birdie', 'Irwin', '1984-01-04', 'Port Felicia', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.745164', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (62, NULL, NULL, NULL, NULL, NULL, NULL, 'Gleason', 'Jaleel', 'Linnea', '2002-01-25', 'Corkeryville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.747215', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (63, NULL, NULL, NULL, NULL, NULL, NULL, 'Mertz', 'Simone', 'Yoshiko', '2015-04-09', 'Port Quinton', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.749773', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (64, NULL, NULL, NULL, NULL, NULL, NULL, 'Rempel', 'Andres', 'Toby', '2010-03-30', 'South Reyesfort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.75352', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (65, NULL, NULL, NULL, NULL, NULL, NULL, 'Schuster', 'Nat', 'Garett', '1941-04-01', 'Port Kurtiston', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.757301', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (66, NULL, NULL, NULL, NULL, NULL, NULL, 'Morar', 'Golda', 'Sammie', '1983-12-17', 'Lake Ottilietown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.76097', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (67, NULL, NULL, NULL, NULL, NULL, NULL, 'Beatty', 'Diamond', 'Emmitt', '1965-04-14', 'Port Romainefurt', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.764847', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (68, NULL, NULL, NULL, NULL, NULL, NULL, 'Roberts', 'Kris', 'Christina', '1997-02-26', 'Lednerberg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.76866', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (69, NULL, NULL, NULL, NULL, NULL, NULL, 'Shanahan', 'Adell', 'Elza', '1945-06-15', 'North Adolphmouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.771946', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (70, NULL, NULL, NULL, NULL, NULL, NULL, 'Heidenreich', 'Florida', 'Estel', '1974-02-05', 'Allenechester', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.775166', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (71, NULL, NULL, NULL, NULL, NULL, NULL, 'O''Kon', 'May', 'Jovany', '1952-07-07', 'Carolynborough', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.778744', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (72, NULL, NULL, NULL, NULL, NULL, NULL, 'Schaefer', 'Grayce', 'Nathanial', '2014-11-03', 'Port Elody', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.782136', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (73, NULL, NULL, NULL, NULL, NULL, NULL, 'Ullrich', 'Jaydon', 'Kimberly', '1978-04-27', 'Ellenstad', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.784361', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (74, NULL, NULL, NULL, NULL, NULL, NULL, 'Borer', 'Tracey', 'Nona', '1918-08-12', 'Monahanton', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.786497', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (75, NULL, NULL, NULL, NULL, NULL, NULL, 'Jast', 'Asha', 'Duane', '1919-01-19', 'Zoieside', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.788705', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (76, NULL, NULL, NULL, NULL, NULL, NULL, 'Schamberger', 'Alexandrine', 'Eulah', '1955-03-09', 'Alvenachester', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.790916', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (77, NULL, NULL, NULL, NULL, NULL, NULL, 'Schiller', 'Ardella', 'Rebekah', '1944-05-21', 'North Josue', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:12:00.793131', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (78, NULL, NULL, NULL, NULL, NULL, NULL, 'Tremblay', 'Jay', 'Carter', '2002-09-19', 'West Margot', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.334168', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (79, NULL, NULL, NULL, NULL, NULL, NULL, 'Durgan', 'Lavinia', 'Veda', '1979-04-09', 'West Ernestineshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.338264', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (80, NULL, NULL, NULL, NULL, NULL, NULL, 'Hodkiewicz', 'Tom', 'Verla', '1938-04-24', 'West Zelmafurt', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.341592', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (81, NULL, NULL, NULL, NULL, NULL, NULL, 'Schulist', 'Arno', 'Tania', '1926-10-02', 'Hamillton', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.344909', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (82, NULL, NULL, NULL, NULL, NULL, NULL, 'Rogahn', 'Cassidy', 'Gregg', '1981-12-22', 'East Reyes', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.349505', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (83, NULL, NULL, NULL, NULL, NULL, NULL, 'Kuhlman', 'Deion', 'Shany', '1995-08-29', 'Bergeland', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.352268', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (84, NULL, NULL, NULL, NULL, NULL, NULL, 'Blick', 'Elsie', 'Sven', '1926-08-21', 'Rickyfort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.355178', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (85, NULL, NULL, NULL, NULL, NULL, NULL, 'Kuvalis', 'Tina', 'Kathlyn', '1966-07-02', 'New Kieran', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.358004', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (86, NULL, NULL, NULL, NULL, NULL, NULL, 'Cremin', 'Consuelo', 'Floy', '1935-08-16', 'Amaramouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.359951', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (87, NULL, NULL, NULL, NULL, NULL, NULL, 'O''Keefe', 'Maia', 'Emma', '1956-12-13', 'Jordimouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.361816', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (88, NULL, NULL, NULL, NULL, NULL, NULL, 'Rohan', 'Sydni', 'Katrine', '1983-11-10', 'New Vicentaton', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.363604', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (89, NULL, NULL, NULL, NULL, NULL, NULL, 'Quitzon', 'Riley', 'Emmet', '1953-08-24', 'Rhodaport', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.365404', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (90, NULL, NULL, NULL, NULL, NULL, NULL, 'Kautzer', 'Sheridan', 'Elijah', '1921-03-04', 'Mullerchester', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.367166', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (91, NULL, NULL, NULL, NULL, NULL, NULL, 'Keeling', 'Oren', 'Kiel', '1998-04-30', 'Wymantown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.368904', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (92, NULL, NULL, NULL, NULL, NULL, NULL, 'Oberbrunner', 'Alfredo', 'Lila', '1930-12-10', 'North Jodie', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.370777', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (93, NULL, NULL, NULL, NULL, NULL, NULL, 'Von', 'Treva', 'Kara', '1928-08-16', 'Carrollburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.372534', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (94, NULL, NULL, NULL, NULL, NULL, NULL, 'McLaughlin', 'Stanford', 'Peyton', '1956-09-03', 'West Tylertown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.376105', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (95, NULL, NULL, NULL, NULL, NULL, NULL, 'Gutkowski', 'Buddy', 'Narciso', '1946-05-07', 'Orphafort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.379542', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (96, NULL, NULL, NULL, NULL, NULL, NULL, 'Romaguera', 'General', 'Alan', '1940-05-21', 'New Linnea', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.38308', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (97, NULL, NULL, NULL, NULL, NULL, NULL, 'Schmeler', 'Leon', 'Abdul', '2005-10-02', 'Rosenbaumburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.386484', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (98, NULL, NULL, NULL, NULL, NULL, NULL, 'O''Kon', 'Lilliana', 'Polly', '1918-06-04', 'North Emmy', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.389329', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (99, NULL, NULL, NULL, NULL, NULL, NULL, 'Carter', 'Robb', 'Delfina', '2006-10-18', 'West Maiaberg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.392189', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (100, NULL, NULL, NULL, NULL, NULL, NULL, 'Larkin', 'Nona', 'Trenton', '1965-08-02', 'Port Esteban', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.395106', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (101, NULL, NULL, NULL, NULL, NULL, NULL, 'Stokes', 'Otilia', 'Citlalli', '2006-07-15', 'Katherinemouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.397878', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (102, NULL, NULL, NULL, NULL, NULL, NULL, 'Aufderhar', 'Mauricio', 'Ahmad', '1945-01-21', 'North Brandonhaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-28 17:15:10.39983', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (103, NULL, NULL, NULL, NULL, NULL, NULL, 'Kunde', 'Vance', 'Alycia', '1954-12-25', 'Nathanielbury', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.344253', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (104, NULL, NULL, NULL, NULL, NULL, NULL, 'Kerluke', 'Elliot', 'Genoveva', '2006-12-02', 'Danieltown', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.356141', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (105, NULL, NULL, NULL, NULL, NULL, NULL, 'Lubowitz', 'Gilbert', 'Else', '2010-12-28', 'Cartwrightshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.358948', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (106, NULL, NULL, NULL, NULL, NULL, NULL, 'Gaylord', 'Jaunita', 'Griffin', '1932-01-15', 'North Aaron', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.361642', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (107, NULL, NULL, NULL, NULL, NULL, NULL, 'Rowe', 'Selena', 'Corene', '1976-11-11', 'East Raheem', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.365763', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (108, NULL, NULL, NULL, NULL, NULL, NULL, 'Pacocha', 'Chester', 'Sedrick', '1937-04-16', 'Willmsview', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.369766', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (109, NULL, NULL, NULL, NULL, NULL, NULL, 'Hauck', 'Josiane', 'Leopold', '1998-02-12', 'New Clarabelleshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.373884', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (110, NULL, NULL, NULL, NULL, NULL, NULL, 'Dicki', 'Price', 'Marian', '1997-09-02', 'North Kristin', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.377925', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (111, NULL, NULL, NULL, NULL, NULL, NULL, 'Oberbrunner', 'Caden', 'Berneice', '1933-01-23', 'Halvorsonfurt', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.381464', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (112, NULL, NULL, NULL, NULL, NULL, NULL, 'Hills', 'Mary', 'Eliza', '1961-10-30', 'Gretaberg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.385188', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (113, NULL, NULL, NULL, NULL, NULL, NULL, 'Toy', 'Kaleigh', 'Salvatore', '1949-01-14', 'Twilamouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.388856', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (114, NULL, NULL, NULL, NULL, NULL, NULL, 'Shields', 'Gus', 'Kristian', '1968-12-05', 'North Jakob', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.392435', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (115, NULL, NULL, NULL, NULL, NULL, NULL, 'Nolan', 'Crystal', 'Savannah', '1975-04-30', 'North Sherwoodport', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.395178', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (116, NULL, NULL, NULL, NULL, NULL, NULL, 'Wolff', 'Alexandria', 'Chyna', '1977-07-04', 'Raynorchester', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.397762', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (117, NULL, NULL, NULL, NULL, NULL, NULL, 'Boyer', 'Dixie', 'Leonor', '2002-07-29', 'Beattyberg', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.400342', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (118, NULL, NULL, NULL, NULL, NULL, NULL, 'McDermott', 'Presley', 'Reba', '1925-05-04', 'New Matt', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.402979', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (119, NULL, NULL, NULL, NULL, NULL, NULL, 'Oberbrunner', 'Luis', 'Brielle', '1997-08-22', 'South Rowlandmouth', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.405623', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (120, NULL, NULL, NULL, NULL, NULL, NULL, 'Feeney', 'Kitty', 'Kari', '1946-08-15', 'North Leland', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.408399', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (121, NULL, NULL, NULL, NULL, NULL, NULL, 'Hegmann', 'Angelo', 'Roberta', '1961-05-01', 'Port Mandyfort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.41107', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (122, NULL, NULL, NULL, NULL, NULL, NULL, 'Hansen', 'Frederick', 'Ardella', '2006-01-15', 'Gleichnerfort', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.413633', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (123, NULL, NULL, NULL, NULL, NULL, NULL, 'Cremin', 'Hattie', 'Verner', '1978-12-27', 'Lake Devenstad', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.417766', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (124, NULL, NULL, NULL, NULL, NULL, NULL, 'Walsh', 'Elvis', 'Katelyn', '1975-11-07', 'East Rocky', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.421894', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (125, NULL, NULL, NULL, NULL, NULL, NULL, 'Abshire', 'Irwin', 'Janice', '1957-09-23', 'Orastad', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.425969', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (126, NULL, NULL, NULL, NULL, NULL, NULL, 'Wehner', 'Kameron', 'Drake', '1990-03-04', 'Bernadinehaven', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.430179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
+INSERT INTO public.tbl_person VALUES (127, NULL, NULL, NULL, NULL, NULL, NULL, 'Terry', 'Clare', 'Genevieve', '1966-09-30', 'North Theodora', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-04-04 13:22:04.433865', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false);
INSERT INTO public.tbl_person VALUES (3, NULL, NULL, NULL, NULL, NULL, NULL, 'McKenzie', 'Vicenta', 'Abraham', '2002-12-30', 'Brooksburgh', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.624239', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567A', false);
INSERT INTO public.tbl_person VALUES (4, NULL, NULL, NULL, NULL, NULL, NULL, 'Wilderman', 'Rocio', 'Jayson', '2002-09-03', 'Hermannshire', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.632551', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567B', false);
INSERT INTO public.tbl_person VALUES (5, NULL, NULL, NULL, NULL, NULL, NULL, 'Harvey', 'Joshuah', 'Halie', '1930-01-18', 'Mitchellville', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'm', NULL, true, '2016-03-27 22:23:20.634179', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '01234567C', false);
@@ -98,4 +223,4 @@ DELETE FROM lehre.tbl_studienplan WHERE tbl_studienplan < 5;
INSERT INTO lehre.tbl_studienplan VALUES (1, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (2, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
INSERT INTO lehre.tbl_studienplan VALUES (3, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
-INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
\ No newline at end of file
+INSERT INTO lehre.tbl_studienplan VALUES (4, 1, 'A', 'V1', '01234', 6, 'English', 't', 15, 't', NOW(), 'codeception', NOW(), NULL, NULL, NULL, NULL, NULL);
diff --git a/tests/codeception/acceptance.suite.dist.yml b/tests/codeception/acceptance.suite.dist.yml
index 648020261..616dd916a 100644
--- a/tests/codeception/acceptance.suite.dist.yml
+++ b/tests/codeception/acceptance.suite.dist.yml
@@ -14,7 +14,7 @@ modules:
PhpBrowser:
url: 'http://admin:1q2w3@localhost/build/'
Db:
- dsn: 'pgsql:host=calva;port=5433;dbname=devfhcomplete3'
+ dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
user: 'fhcomplete'
password: 'fhcomplete'
dump: codeception/_data/dump.sql
diff --git a/tests/codeception/api.suite.dist.yml b/tests/codeception/api.suite.dist.yml
index ed36c85f1..e1132b077 100644
--- a/tests/codeception/api.suite.dist.yml
+++ b/tests/codeception/api.suite.dist.yml
@@ -2,6 +2,7 @@ class_name: ApiTester
modules:
enabled:
- \Helper\Api
+ - Db
- REST:
# API URL
url: http://localhost/build/index.ci.php/api/
@@ -9,3 +10,12 @@ modules:
depends: PhpBrowser
# Limits PhpBrowser to JSON or XML
part: Json
+ config:
+ Db:
+ dsn: 'pgsql:host=localhost;port=5432;dbname=fhctest'
+ user: 'fhcomplete'
+ password: 'fhcomplete'
+ dump: codeception/_data/dump.sql
+ populate: true
+ cleanup: false
+ reconnect: false
diff --git a/tests/codeception/api/v1/PersonCept.php b/tests/codeception/api/v1/PersonCept.php
index 9aa323981..2260b9bb4 100644
--- a/tests/codeception/api/v1/PersonCept.php
+++ b/tests/codeception/api/v1/PersonCept.php
@@ -1,26 +1,33 @@
wantTo('Test API call v1/person/person/Person');
+$I->wantTo('test the Person id');
$I->amHttpAuthenticated("admin", "1q2w3");
$I->haveHttpHeader('FHC-API-KEY', 'testapikey@fhcomplete.org');
$I->sendGET('v1/person/person/Person', array('person_id' => 3));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson([
- 'success' => TRUE,
- 'message' => 'Person found']);
+ 'person_id' => '3',
+ 'nachname' => 'McKenzie']);
$I->sendGET('v1/person/person/Person', array('code' => '01234567A'));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson([
- 'success' => TRUE,
- 'message' => 'Person found']);
+ 'person_id' => '4',
+ 'nachname' => 'Wilderman']);
-$I->sendGET('v1/person/person/Person', array('code' => '01234567A', 'email' => 'mckenzie.vicenta@calva.dev'));
+$I->wantTo('test the Person not found');
+$I->sendGET('v1/person/person/Person', array('code' => '12345'));
+$I->seeResponseCodeIs(200);
+$I->seeResponseIsJson();
+$I->seeResponseContainsJson([
+ 'success' => false,
+ 'message' => 'Person not found']);
+
+/*$I->sendGET('v1/person/person/Person', array('code' => 'bd94ef5d5a', 'email' => '12351235'));
$I->seeResponseCodeIs(200);
$I->seeResponseIsJson();
$I->seeResponseContainsJson([
'success' => TRUE,
- 'message' => 'Person found']);
\ No newline at end of file