[icinga-checkins] icinga.org: icinga-web/r1.6: * Fixed initial sql scripts (fixes #2378)

git at icinga.org git at icinga.org
Wed Feb 29 16:40:55 CET 2012


Module: icinga-web
Branch: r1.6
Commit: 5229c55a6cc0714acc236c0b6c8cdbc947a488ae
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=5229c55a6cc0714acc236c0b6c8cdbc947a488ae

Author: Marius Hein <marius.hein at netways.de>
Date:   Wed Feb 29 10:23:21 2012 +0100

* Fixed initial sql scripts (fixes #2378)

---

 app/modules/AppKit/config/module.xml.in            |    2 +-
 etc/schema/mysql.sql                               |    6 +++---
 etc/schema/oracle.sql                              |    2 +-
 etc/schema/pgsql.sql                               |    1 -
 etc/schema/sqlite.sql                              |    1 -
 ...l_v1-6_to_v1-7.sql => mysql_v1-6_to_v1-6-2.sql} |    0 
 ..._v1-6_to_v1-7.sql => oracle_v1-6_to_v1-6-2.sql} |    0 
 ...l_v1-6_to_v1-7.sql => pgsql_v1-6_to_v1-6-2.sql} |    0 
 8 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/modules/AppKit/config/module.xml.in b/app/modules/AppKit/config/module.xml.in
index cddbdd9..73ffaad 100755
--- a/app/modules/AppKit/config/module.xml.in
+++ b/app/modules/AppKit/config/module.xml.in
@@ -83,7 +83,7 @@
                 	<ae:parameter>%core.module_dir%/AppKit/config/routing.xml</ae:parameter>
                 </setting>
 
-                <setting name="verbose">
+                <setting name="debug.verbose">
                     <!--  Debug output for db queries -->
                     <!-- 
                     <ae:parameter>Api_Store_LegacyLayer_IcingaApiModel</ae:parameter>
diff --git a/etc/schema/mysql.sql b/etc/schema/mysql.sql
index 43a91ed..2cb080c 100644
--- a/etc/schema/mysql.sql
+++ b/etc/schema/mysql.sql
@@ -1,6 +1,6 @@
 /*****************************************************/
 /* Auto generated mysql SQL Schema file for icinga-web*/
-/* Creation date: 2011-09-12T14:53:22+02:00          */
+/* Creation date: 2012-02-29T10:20:14+01:00          */
 /****************************************************/
 
 
@@ -17,7 +17,7 @@ CREATE TABLE nsm_role (role_id INT AUTO_INCREMENT, role_name VARCHAR(40) NOT NUL
 CREATE TABLE nsm_session (session_entry_id INT AUTO_INCREMENT, session_id VARCHAR(255) NOT NULL, session_name VARCHAR(255) NOT NULL, session_data LONGTEXT NOT NULL, session_checksum VARCHAR(255) NOT NULL, session_created DATETIME NOT NULL, session_modified DATETIME NOT NULL, PRIMARY KEY(session_entry_id)) ENGINE = INNODB;
 CREATE TABLE nsm_target (target_id INT AUTO_INCREMENT, target_name VARCHAR(45) NOT NULL, target_description VARCHAR(100), target_class VARCHAR(80), target_type VARCHAR(45) NOT NULL, PRIMARY KEY(target_id)) ENGINE = INNODB;
 CREATE TABLE nsm_target_value (tv_pt_id INT, tv_key VARCHAR(45), tv_val VARCHAR(45) NOT NULL, PRIMARY KEY(tv_pt_id, tv_key)) ENGINE = INNODB;
-CREATE TABLE nsm_user (user_id INT AUTO_INCREMENT, user_account INT DEFAULT 0 NOT NULL, user_name VARCHAR(127) NOT NULL, user_lastname VARCHAR(40) NOT NULL, user_firstname VARCHAR(40) NOT NULL, user_password VARCHAR(64) NOT NULL, user_salt VARCHAR(64) NOT NULL, user_authsrc VARCHAR(45) DEFAULT 'internal' NOT NULL, user_authid VARCHAR(127), user_authkey VARCHAR(64), user_email VARCHAR(254) NOT NULL, user_disabled TINYINT DEFAULT '1' NOT NULL, user_created DATETIME NOT NULL, user_modified DATETIME NOT NULL, UNIQUE INDEX user_name_unique_idx (user_name), UNIQUE INDEX user_email_unique_idx (user_email), INDEX user_search_idx (user_name, user_authsrc, user_authid, user_disabled), PRIMARY KEY(user_id)) ENGINE = INNODB;
+CREATE TABLE nsm_user (user_id INT AUTO_INCREMENT, user_account INT DEFAULT 0 NOT NULL, user_name VARCHAR(127) NOT NULL, user_lastname VARCHAR(40) NOT NULL, user_firstname VARCHAR(40) NOT NULL, user_password VARCHAR(64) NOT NULL, user_salt VARCHAR(64) NOT NULL, user_authsrc VARCHAR(45) DEFAULT 'internal' NOT NULL, user_authid VARCHAR(127), user_authkey VARCHAR(64), user_email VARCHAR(254) NOT NULL, user_disabled TINYINT DEFAULT '1' NOT NULL, user_created DATETIME NOT NULL, user_modified DATETIME NOT NULL, UNIQUE INDEX user_name_unique_idx (user_name), INDEX user_search_idx (user_name, user_authsrc, user_authid, user_disabled), PRIMARY KEY(user_id)) ENGINE = INNODB;
 CREATE TABLE nsm_user_preference (upref_id INT AUTO_INCREMENT, upref_user_id INT NOT NULL, upref_val VARCHAR(100), upref_longval LONGTEXT, upref_key VARCHAR(50) NOT NULL, upref_created DATETIME NOT NULL, upref_modified DATETIME NOT NULL, INDEX upref_search_key_idx_idx (upref_key), INDEX principal_role_id_ix_idx (upref_user_id), PRIMARY KEY(upref_id)) ENGINE = INNODB;
 CREATE TABLE nsm_user_role (usro_user_id INT, usro_role_id INT, INDEX nsm_user_role_ix_idx (usro_role_id), PRIMARY KEY(usro_user_id, usro_role_id)) ENGINE = INNODB;
 ALTER TABLE cronk ADD CONSTRAINT cronk_cronk_user_id_nsm_user_user_id FOREIGN KEY (cronk_user_id) REFERENCES nsm_user(user_id);
@@ -81,4 +81,4 @@ INSERT INTO nsm_principal_target (pt_id,pt_principal_id,pt_target_id) VALUES ('1
 INSERT INTO nsm_principal_target (pt_id,pt_principal_id,pt_target_id) VALUES ('11','3','18');
 INSERT INTO nsm_user_role (usro_user_id,usro_role_id) VALUES ('1','1');
 INSERT INTO nsm_user_role (usro_user_id,usro_role_id) VALUES ('1','2');
-INSERT INTO nsm_user_role (usro_user_id,usro_role_id) VALUES ('1','3');
+INSERT INTO nsm_user_role (usro_user_id,usro_role_id) VALUES ('1','3');
\ No newline at end of file
diff --git a/etc/schema/oracle.sql b/etc/schema/oracle.sql
index fee42a4..d32988f 100644
--- a/etc/schema/oracle.sql
+++ b/etc/schema/oracle.sql
@@ -29,7 +29,7 @@ CREATE TABLE nsm_target (target_id NUMBER(10), target_name VARCHAR2(45) NOT NULL
 /
 CREATE TABLE nsm_target_value (tv_pt_id NUMBER(10), tv_key VARCHAR2(45), tv_val VARCHAR2(45) NOT NULL, PRIMARY KEY(tv_pt_id, tv_key))
 /
-CREATE TABLE nsm_user (user_id NUMBER(10), user_account NUMBER(10) DEFAULT 0 NOT NULL, user_name VARCHAR2(127) NOT NULL, user_lastname VARCHAR2(40) NOT NULL, user_firstname VARCHAR2(40) NOT NULL, user_password VARCHAR2(64) NOT NULL, user_salt VARCHAR2(64) NOT NULL, user_authsrc VARCHAR2(45) DEFAULT 'internal' NOT NULL, user_authid VARCHAR2(127), user_authkey VARCHAR2(64), user_email VARCHAR2(254) NOT NULL, user_disabled NUMBER(3) DEFAULT 1 NOT NULL, user_created DATE NOT NULL, user_modified DATE NOT NULL, PRIMARY KEY(user_id), CONSTRAINT user_unique UNIQUE (user_name), CONSTRAINT user_email_unique UNIQUE (user_email))
+CREATE TABLE nsm_user (user_id NUMBER(10), user_account NUMBER(10) DEFAULT 0 NOT NULL, user_name VARCHAR2(127) NOT NULL, user_lastname VARCHAR2(40) NOT NULL, user_firstname VARCHAR2(40) NOT NULL, user_password VARCHAR2(64) NOT NULL, user_salt VARCHAR2(64) NOT NULL, user_authsrc VARCHAR2(45) DEFAULT 'internal' NOT NULL, user_authid VARCHAR2(127), user_authkey VARCHAR2(64), user_email VARCHAR2(254) NOT NULL, user_disabled NUMBER(3) DEFAULT 1 NOT NULL, user_created DATE NOT NULL, user_modified DATE NOT NULL, PRIMARY KEY(user_id), CONSTRAINT user_unique UNIQUE (user_name))
 /
 CREATE TABLE nsm_user_preference (upref_id NUMBER(10), upref_user_id NUMBER(10) NOT NULL, upref_val VARCHAR2(100), upref_longval CLOB, upref_key VARCHAR2(50) NOT NULL, upref_created DATE NOT NULL, upref_modified DATE NOT NULL, PRIMARY KEY(upref_id))
 /
diff --git a/etc/schema/pgsql.sql b/etc/schema/pgsql.sql
index fbecff0..443be5b 100644
--- a/etc/schema/pgsql.sql
+++ b/etc/schema/pgsql.sql
@@ -25,7 +25,6 @@ CREATE UNIQUE INDEX cc_uid_UNIQUE ON cronk_category (cc_uid);
 CREATE INDEX pt_target_id_ix ON nsm_principal_target (pt_target_id);
 CREATE INDEX pt_principal_id_ix ON nsm_principal_target (pt_principal_id);
 CREATE UNIQUE INDEX user_name_unique ON nsm_user (user_name);
-CREATE UNIQUE INDEX user_email_unique ON nsm_user (user_email);
 CREATE INDEX user_search ON nsm_user (user_name, user_authsrc, user_authid, user_disabled);
 CREATE INDEX upref_search_key_idx ON nsm_user_preference (upref_key);
 CREATE INDEX principal_role_id_ix ON nsm_user_preference (upref_user_id);
diff --git a/etc/schema/sqlite.sql b/etc/schema/sqlite.sql
index 8b34d5e..5d75b57 100644
--- a/etc/schema/sqlite.sql
+++ b/etc/schema/sqlite.sql
@@ -94,7 +94,6 @@ CREATE TABLE nsm_user (
 	user_modified DATETIME NOT NULL
 );
 CREATE UNIQUE INDEX user_name_unique_idx ON nsm_user(user_name);
-CREATE UNIQUE INDEX user_email_unique_idx ON nsm_user(user_email);
 CREATE INDEX user_search_idx ON nsm_user(user_name, user_authsrc, user_authid, user_disabled);
 
 CREATE TABLE nsm_user_preference (
diff --git a/etc/schema/updates/mysql_v1-6_to_v1-7.sql b/etc/schema/updates/mysql_v1-6_to_v1-6-2.sql
similarity index 100%
rename from etc/schema/updates/mysql_v1-6_to_v1-7.sql
rename to etc/schema/updates/mysql_v1-6_to_v1-6-2.sql
diff --git a/etc/schema/updates/oracle_v1-6_to_v1-7.sql b/etc/schema/updates/oracle_v1-6_to_v1-6-2.sql
similarity index 100%
rename from etc/schema/updates/oracle_v1-6_to_v1-7.sql
rename to etc/schema/updates/oracle_v1-6_to_v1-6-2.sql
diff --git a/etc/schema/updates/pgsql_v1-6_to_v1-7.sql b/etc/schema/updates/pgsql_v1-6_to_v1-6-2.sql
similarity index 100%
rename from etc/schema/updates/pgsql_v1-6_to_v1-7.sql
rename to etc/schema/updates/pgsql_v1-6_to_v1-6-2.sql





More information about the icinga-checkins mailing list