blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

DB-Migrate CI

Browse Source
This commit is contained in:
Paminger
2016-02-29 16:01:52 +01:00
parent f9e3c37922
commit 2236ba7d26
4 changed files with 98 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.json
+2 -1
View File
@@ -44,7 +44,8 @@
"codeigniter-restserver": "2.6",
"easyrdf/easyrdf": "0.9.*",
"ml/json-ld": "1.*",
"rougin/combustor":"1.1.*",
"rougin/combustor": "1.1.*",
"rougin/refinery": "*",
"components/jquery": "2.1.4",
"components/angular.js": "1.3.16",
"components/bootstrap": "3.3.5",
composer.lock
Generated
+67 -2
View File
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "3446439fc0a3c19a1292cba921c29a92",
"content-hash": "f83541dff2ed308d9d00f9da737a085a",
"hash": "ea064e414812c16fa7b4e1fc066dc2b3",
"content-hash": "73ee27147eb49e32aef9d975d2a90ffa",
"packages": [
{
"name": "codeigniter-restserver",
@@ -951,6 +951,71 @@
],
"time": "2015-11-05 03:32:43"
},
{
"name": "rougin/refinery",
"version": "v0.1.6",
"source": {
"type": "git",
"url": "https://github.com/rougin/refinery.git",
"reference": "d32a49dfb61072dcf9619b181de9d9c762e6e26c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rougin/refinery/zipball/d32a49dfb61072dcf9619b181de9d9c762e6e26c",
"reference": "d32a49dfb61072dcf9619b181de9d9c762e6e26c",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"rougin/blueprint": "0.1.*",
"rougin/describe": "1.2.*",
"rougin/spark-plug": "0.2.*"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"scrutinizer/ocular": "~1.1"
},
"suggest": {
"rougin/codeigniter": "Yet another way to install CodeIgniter via Composer",
"rougin/combustor": "A tool for speeding up web development in CodeIgniter"
},
"bin": [
"bin/refinery",
"bin/refinery.php"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.2-dev"
}
},
"autoload": {
"psr-4": {
"Rougin\\Refinery\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Rougin Royce Gutib",
"email": "rougingutib@gmail.com",
"homepage": "http://rougin.github.io",
"role": "Developer"
}
],
"description": "'Ready-to-eat' migrations for Codeigniter",
"homepage": "https://github.com/rougin/refinery",
"keywords": [
"database",
"migrations",
"php",
"refinery"
],
"time": "2016-03-04 16:55:32"
},
{
"name": "rougin/spark-plug",
"version": "v0.2.0",
include/person.class.php
+21 -13
View File
@@ -22,13 +22,19 @@
/*
* Benoetigt functions.inc.php
*/
require_once(dirname(__FILE__).'/basis_db.class.php');
//require_once(dirname(__FILE__).'/basis_db.class.php'); Now over CI
require_once(dirname(__FILE__).'/datum.class.php');
class person extends basis_db
// CI
require_once(dirname(__FILE__).'/../ci_hack.php');
require_once(dirname(__FILE__).'/../application/models/Person_model.php');
class person extends Person_model
{
use db_extra; //CI Hack
public $errormsg; // string
public $new=true; // boolean
public $new; // boolean
public $personen = array(); // person Objekt
public $done=false; // boolean
@@ -47,7 +53,7 @@ class person extends basis_db
public $foto; // text
public $anmerkungen; // varchar(256)
public $homepage; // varchar(256)
public $svnr; // varchar(16)
public $svnr; // char(10)
public $ersatzkennzeichen; // char(10)
public $familienstand; // char(1)
public $anzahlkinder; // smalint
@@ -86,7 +92,8 @@ class person extends basis_db
//person_id auf gueltigkeit pruefen
if(is_numeric($person_id) && $person_id!='')
{
$qry = "SELECT person_id, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen,
/* Alter Code
$qry = "SELECT person_id, sprache, anrede, titelpost, titelpre, nachname, vorname, vornamen,
gebdatum, gebort, gebzeit, foto, anmerkung, homepage, svnr, ersatzkennzeichen,
familienstand, anzahlkinder, aktiv, insertamum, insertvon, updateamum, updatevon, ext_id,
geschlecht, staatsbuergerschaft, geburtsnation, kurzbeschreibung, zugangscode, foto_sperre, matr_nr
@@ -98,7 +105,8 @@ class person extends basis_db
return false;
}
if($row = $this->db_fetch_object())
if($row = $this->db_fetch_object())*/
if ($row = $this->get_personen($person_id))
{
$this->person_id = $row->person_id;
$this->sprache = $row->sprache;
@@ -180,7 +188,7 @@ class person extends basis_db
$this->anrede = trim($this->anrede);
$this->titelpost = trim($this->titelpost);
$this->titelpre = trim($this->titelpre);
if(mb_strlen($this->sprache)>16)
{
$this->errormsg = 'Sprache darf nicht laenger als 16 Zeichen sein';
@@ -244,7 +252,7 @@ class person extends basis_db
$this->errormsg = 'SVNR darf nicht laenger als 16 Zeichen sein';
return false;
}
if(mb_strlen($this->matr_nr)>32)
{
$this->errormsg = 'Matrikelnummer darf nicht laenger als 32 Zeichen sein';
@@ -348,7 +356,7 @@ class person extends basis_db
$this->errormsg = 'Geschlecht muss w, m oder u sein!';
return false;
}
//Pruefen ob das Geburtsdatum mit der SVNR uebereinstimmt.
if($this->svnr!='' && $this->gebdatum!='')
{
@@ -369,7 +377,7 @@ class person extends basis_db
$this->errormsg = 'Format des Geburtsdatums ist ungueltig';
return false;
}
/* das muss nicht immer so sein
$day_svnr = mb_substr($this->svnr, 4, 2);
$month_svnr = mb_substr($this->svnr, 6, 2);
@@ -504,7 +512,7 @@ class person extends basis_db
return false;
}
}
/**
* Liefert die Tabellenelemente die den Kriterien der Parameter entsprechen
* @param $filter String mit Vorname oder Nachname
@@ -520,7 +528,7 @@ class person extends basis_db
public.tbl_person
LEFT JOIN public.tbl_benutzer USING(person_id)
WHERE true ";
if($filter!='')
{
$sql_query.=" AND nachname ~* '".$this->db_escape($filter)."' OR
@@ -533,7 +541,7 @@ class person extends basis_db
$sql_query .= " ORDER BY $order";
if($filter=='')
$sql_query .= " LIMIT 30";
if($this->db_query($sql_query))
{
while($row = $this->db_fetch_object())
system/fhcomplete3.0.sql
+8 -11
View File
@@ -15,6 +15,11 @@ SET escape_string_warning = off;
COMMENT ON DATABASE fhcomplete IS 'FH-Complete 3.0';
-- Rollen im System
-- CREATE ROLE wawi LOGIN PASSWORD 'vilesci';
-- CREATE ROLE wawi LOGIN PASSWORD 'wawi';
-- CREATE ROLE wawi LOGIN PASSWORD 'web';
--
-- Name: bis; Type: SCHEMA; Schema: -; Owner: postgres
@@ -108,10 +113,10 @@ ALTER SCHEMA wawi OWNER TO fhcomplete;
-- Name: plpgsql; Type: PROCEDURAL LANGUAGE; Schema: -; Owner: postgres
--
CREATE PROCEDURAL LANGUAGE plpgsql;
-- CREATE PROCEDURAL LANGUAGE plpgsql;
ALTER PROCEDURAL LANGUAGE plpgsql OWNER TO fhcomplete;
-- ALTER PROCEDURAL LANGUAGE plpgsql OWNER TO fhcomplete;
SET search_path = public, pg_catalog;
@@ -159,16 +164,7 @@ CREATE FUNCTION get_rolle_prestudent(integer, character varying) RETURNS charact
ALTER FUNCTION public.get_rolle_prestudent(integer, character varying) OWNER TO fhcomplete;
--
-- Name: plpgsql_call_handler(); Type: FUNCTION; Schema: public; Owner: postgres
--
CREATE FUNCTION plpgsql_call_handler() RETURNS language_handler
LANGUAGE c
AS '$libdir/plpgsql', 'plpgsql_call_handler';
ALTER FUNCTION public.plpgsql_call_handler() OWNER TO fhcomplete;
SET search_path = bis, pg_catalog;
@@ -46370,4 +46366,5 @@ GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE tbl_zahlungstyp TO vilesci;
--
-- PostgreSQL database dump complete
--
SET search_path = public, pg_catalog;