summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon2011-03-06 13:04:04 +0100
committerSimon2011-03-06 13:04:04 +0100
commit72ab13da979af7ccfc5ecbf48ffc304189edf508 (patch)
tree120ff3c43795767983042b05223d2df9e9ca6273
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-72ab13da979af7ccfc5ecbf48ffc304189edf508.tar.gz
pbs2-72ab13da979af7ccfc5ecbf48ffc304189edf508.tar.xz
pbs2-72ab13da979af7ccfc5ecbf48ffc304189edf508.zip
update
-rw-r--r--application/configs/application.ini2
-rw-r--r--application/configs/application.ini 26
-rw-r--r--droppbs.sql3
-rw-r--r--pbs.sql2
4 files changed, 30 insertions, 3 deletions
diff --git a/application/configs/application.ini b/application/configs/application.ini
index 6970da3..9bfaec2 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -10,7 +10,7 @@ resources.frontController.params.displayExceptions = 0
resources.db.adapter = PDO_MYSQL
resources.db.params.host = localhost
resources.db.params.username = root
-resources.db.params.password = lsfks
+resources.db.params.password = 123456
resources.db.params.dbname = pbs
resources.db.isDefaultTableAdapter = true
diff --git a/application/configs/application.ini b/application/configs/application.ini
new file mode 100644
index 0000000..6970da3
--- /dev/null
+++ b/application/configs/application.ini
@@ -0,0 +1,26 @@
+[production]
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+includePaths.library = APPLICATION_PATH "/../library"
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.params.displayExceptions = 0
+resources.db.adapter = PDO_MYSQL
+resources.db.params.host = localhost
+resources.db.params.username = root
+resources.db.params.password = lsfks
+resources.db.params.dbname = pbs
+resources.db.isDefaultTableAdapter = true
+
+[staging : production]
+
+[testing : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1
diff --git a/droppbs.sql b/droppbs.sql
index 76cb448..3412fd2 100644
--- a/droppbs.sql
+++ b/droppbs.sql
@@ -1,3 +1,4 @@
+USE pbs;
DROP TABLE pbs_bootiso;
DROP TABLE pbs_bootmenuentries;
DROP TABLE pbs_filterentries;
@@ -19,4 +20,4 @@ DROP TABLE pbs_bootos;
DROP TABLE pbs_bootmenu;
DROP TABLE pbs_config;
DROP TABLE pbs_group;
-DROP TABLE pbs_membership; \ No newline at end of file
+DROP TABLE pbs_membership;
diff --git a/pbs.sql b/pbs.sql
index f969cce..8161931 100644
--- a/pbs.sql
+++ b/pbs.sql
@@ -275,7 +275,7 @@ CREATE TABLE IF NOT EXISTS `pbs_filterentries` (
KEY `filtertypeID` (`filtertypeID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-ALTER TABLE `pbs_filterentries` ADD `filterentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST
+ALTER TABLE `pbs_filterentries` ADD `filterentriesID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
ALTER TABLE `pbs_filterentries`
ADD CONSTRAINT `pbs_filterentries_ibfk_1` FOREIGN KEY (`filterID`) REFERENCES `pbs_filter` (`filterID`) ON DELETE CASCADE,
ADD CONSTRAINT `pbs_filterentries_ibfk_2` FOREIGN KEY (`filtertypeID`) REFERENCES `pbs_filtertype` (`filtertypeID`) ON DELETE CASCADE;