Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-15 15:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use default database connection

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-23 13:58:09 +02:00
parent 30b51d12d5
commit 64b95b1588
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Admin/Installer.php
View File

@ -38,10 +38,10 @@ class Installer extends InstallerAbstract
{ {
parent::install(__DIR__ . '/..', $dbPool, $info); parent::install(__DIR__ . '/..', $dbPool, $info);
switch ($dbPool->get('core')->getType()) { switch ($dbPool->get()->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'organization_unit` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'organization_unit` (
`organization_unit_id` int(11) NOT NULL AUTO_INCREMENT, `organization_unit_id` int(11) NOT NULL AUTO_INCREMENT,
`organization_unit_name` varchar(50) DEFAULT NULL, `organization_unit_name` varchar(50) DEFAULT NULL,
`organization_unit_description` varchar(255) DEFAULT NULL, `organization_unit_description` varchar(255) DEFAULT NULL,
@ -52,13 +52,13 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'organization_unit` 'ALTER TABLE `' . $dbPool->get()->prefix . 'organization_unit`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'organization_unit_ibfk_1` FOREIGN KEY (`organization_unit_parent`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_unit` (`organization_unit_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'organization_unit_ibfk_1` FOREIGN KEY (`organization_unit_parent`) REFERENCES `' . $dbPool->get()->prefix . 'organization_unit` (`organization_unit_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'organization_department` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'organization_department` (
`organization_department_id` int(11) NOT NULL AUTO_INCREMENT, `organization_department_id` int(11) NOT NULL AUTO_INCREMENT,
`organization_department_name` varchar(30) DEFAULT NULL, `organization_department_name` varchar(30) DEFAULT NULL,
`organization_department_description` varchar(255) DEFAULT NULL, `organization_department_description` varchar(255) DEFAULT NULL,
@ -71,14 +71,14 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'organization_department` 'ALTER TABLE `' . $dbPool->get()->prefix . 'organization_department`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'organization_department_ibfk_1` FOREIGN KEY (`organization_department_parent`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_department` (`organization_department_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'organization_department_ibfk_1` FOREIGN KEY (`organization_department_parent`) REFERENCES `' . $dbPool->get()->prefix . 'organization_department` (`organization_department_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'organization_department_ibfk_2` FOREIGN KEY (`organization_department_unit`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_unit` (`organization_unit_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'organization_department_ibfk_2` FOREIGN KEY (`organization_department_unit`) REFERENCES `' . $dbPool->get()->prefix . 'organization_unit` (`organization_unit_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'organization_position` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'organization_position` (
`organization_position_id` int(11) NOT NULL AUTO_INCREMENT, `organization_position_id` int(11) NOT NULL AUTO_INCREMENT,
`organization_position_name` varchar(50) DEFAULT NULL, `organization_position_name` varchar(50) DEFAULT NULL,
`organization_position_description` varchar(255) DEFAULT NULL, `organization_position_description` varchar(255) DEFAULT NULL,
@ -91,14 +91,14 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'organization_position` 'ALTER TABLE `' . $dbPool->get()->prefix . 'organization_position`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'organization_position_ibfk_1` FOREIGN KEY (`organization_position_parent`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_position` (`organization_position_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'organization_position_ibfk_1` FOREIGN KEY (`organization_position_parent`) REFERENCES `' . $dbPool->get()->prefix . 'organization_position` (`organization_position_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'organization_position_ibfk_2` FOREIGN KEY (`organization_position_department`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_department` (`organization_department_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'organization_position_ibfk_2` FOREIGN KEY (`organization_position_department`) REFERENCES `' . $dbPool->get()->prefix . 'organization_department` (`organization_department_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'organization_address` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'organization_address` (
`organization_address_id` int(11) NOT NULL AUTO_INCREMENT, `organization_address_id` int(11) NOT NULL AUTO_INCREMENT,
`organization_address_status` tinyint(2) DEFAULT NULL, `organization_address_status` tinyint(2) DEFAULT NULL,
`organization_address_matchcode` varchar(50) DEFAULT NULL, `organization_address_matchcode` varchar(50) DEFAULT NULL,
@ -115,13 +115,13 @@ class Installer extends InstallerAbstract
)ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;' )ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'ALTER TABLE `' . $dbPool->get('core')->prefix . 'organization_address` 'ALTER TABLE `' . $dbPool->get()->prefix . 'organization_address`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'organization_address_ibfk_1` FOREIGN KEY (`organization_address_unit`) REFERENCES `' . $dbPool->get('core')->prefix . 'organization_unit` (`organization_unit_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'organization_address_ibfk_1` FOREIGN KEY (`organization_address_unit`) REFERENCES `' . $dbPool->get()->prefix . 'organization_unit` (`organization_unit_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'INSERT INTO `' . $dbPool->get('core')->prefix . 'organization_unit` (`organization_unit_name`, `organization_unit_description`, `organization_unit_parent`) VALUES 'INSERT INTO `' . $dbPool->get()->prefix . 'organization_unit` (`organization_unit_name`, `organization_unit_description`, `organization_unit_parent`) VALUES
(\'Orange Management\', \'Orange Management\', NULL);' (\'Orange Management\', \'Orange Management\', NULL);'
)->execute(); )->execute();
break; break;

2
Admin/Uninstall.php
View File

@ -39,7 +39,7 @@ class Uninstall extends UninstallAbstract
$query = new Builder($dbPool->get()); $query = new Builder($dbPool->get());
$query->prefix($dbPool->get('core')->getPrefix())->drop( $query->prefix($dbPool->get()->getPrefix())->drop(
'organization_address', 'organization_address',
'organization_department', 'organization_department',
'organization_unit' 'organization_unit'