Use default database connection

This commit is contained in:
Dennis Eichhorn 2017-09-23 13:58:09 +02:00
parent 3ce3202daa
commit 70ea9d4d63
2 changed files with 31 additions and 31 deletions

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 . 'workflow` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'workflow` (
`workflow_id` int(11) NOT NULL AUTO_INCREMENT, `workflow_id` int(11) NOT NULL AUTO_INCREMENT,
`workflow_name` varchar(50) NOT NULL, `workflow_name` varchar(50) NOT NULL,
`workflow_status` int(11) NOT NULL, `workflow_status` int(11) NOT NULL,
@ -53,13 +53,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 . 'workflow` 'ALTER TABLE `' . $dbPool->get()->prefix . 'workflow`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_ibfk_1` FOREIGN KEY (`workflow_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_ibfk_1` FOREIGN KEY (`workflow_created_by`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_media` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'workflow_media` (
`workflow_media_id` int(11) NOT NULL AUTO_INCREMENT, `workflow_media_id` int(11) NOT NULL AUTO_INCREMENT,
`workflow_media_media` int(11) NOT NULL, `workflow_media_media` int(11) NOT NULL,
`workflow_media_workflow` int(11) NOT NULL, `workflow_media_workflow` int(11) NOT NULL,
@ -70,14 +70,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 . 'workflow_media` 'ALTER TABLE `' . $dbPool->get()->prefix . 'workflow_media`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_media_ibfk_1` FOREIGN KEY (`workflow_media_media`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_media_ibfk_1` FOREIGN KEY (`workflow_media_media`) REFERENCES `' . $dbPool->get()->prefix . 'media` (`media_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_media_ibfk_2` FOREIGN KEY (`workflow_media_workflow`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow` (`workflow_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_media_ibfk_2` FOREIGN KEY (`workflow_media_workflow`) REFERENCES `' . $dbPool->get()->prefix . 'workflow` (`workflow_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_element` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'workflow_element` (
`workflow_element_id` int(11) NOT NULL AUTO_INCREMENT, `workflow_element_id` int(11) NOT NULL AUTO_INCREMENT,
`workflow_element_name` varchar(50) NOT NULL, `workflow_element_name` varchar(50) NOT NULL,
`workflow_element_status` int(11) NOT NULL, `workflow_element_status` int(11) NOT NULL,
@ -92,14 +92,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 . 'workflow_element` 'ALTER TABLE `' . $dbPool->get()->prefix . 'workflow_element`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_ibfk_1` FOREIGN KEY (`workflow_element_created_by`) REFERENCES `' . $dbPool->get('core')->prefix . 'account` (`account_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_element_ibfk_1` FOREIGN KEY (`workflow_element_created_by`) REFERENCES `' . $dbPool->get()->prefix . 'account` (`account_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_ibfk_2` FOREIGN KEY (`workflow_element_workflow`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow` (`workflow_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_element_ibfk_2` FOREIGN KEY (`workflow_element_workflow`) REFERENCES `' . $dbPool->get()->prefix . 'workflow` (`workflow_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_element_media` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'workflow_element_media` (
`workflow_element_media_id` int(11) NOT NULL AUTO_INCREMENT, `workflow_element_media_id` int(11) NOT NULL AUTO_INCREMENT,
`workflow_element_media_media` int(11) NOT NULL, `workflow_element_media_media` int(11) NOT NULL,
`workflow_element_media_workflow_element` int(11) NOT NULL, `workflow_element_media_workflow_element` int(11) NOT NULL,
@ -109,14 +109,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 . 'workflow_element_media` 'ALTER TABLE `' . $dbPool->get()->prefix . 'workflow_element_media`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_media_ibfk_1` FOREIGN KEY (`workflow_element_media_media`) REFERENCES `' . $dbPool->get('core')->prefix . 'media` (`media_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_element_media_ibfk_1` FOREIGN KEY (`workflow_element_media_media`) REFERENCES `' . $dbPool->get()->prefix . 'media` (`media_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_media_ibfk_2` FOREIGN KEY (`workflow_element_media_workflow_element`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow_element` (`workflow_element_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_element_media_ibfk_2` FOREIGN KEY (`workflow_element_media_workflow_element`) REFERENCES `' . $dbPool->get()->prefix . 'workflow_element` (`workflow_element_id`);'
)->execute(); )->execute();
$dbPool->get('core')->con->prepare( $dbPool->get()->con->prepare(
'CREATE TABLE if NOT EXISTS `' . $dbPool->get('core')->prefix . 'workflow_element_task` ( 'CREATE TABLE if NOT EXISTS `' . $dbPool->get()->prefix . 'workflow_element_task` (
`workflow_element_task_id` int(11) NOT NULL AUTO_INCREMENT, `workflow_element_task_id` int(11) NOT NULL AUTO_INCREMENT,
`workflow_element_task_task` int(11) NOT NULL, `workflow_element_task_task` int(11) NOT NULL,
`workflow_element_task_workflow_element` int(11) NOT NULL, `workflow_element_task_workflow_element` int(11) NOT NULL,
@ -126,10 +126,10 @@ 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 . 'workflow_element_task` 'ALTER TABLE `' . $dbPool->get()->prefix . 'workflow_element_task`
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_task_ibfk_1` FOREIGN KEY (`workflow_element_task_task`) REFERENCES `' . $dbPool->get('core')->prefix . 'task` (`media_id`), ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_element_task_ibfk_1` FOREIGN KEY (`workflow_element_task_task`) REFERENCES `' . $dbPool->get()->prefix . 'task` (`media_id`),
ADD CONSTRAINT `' . $dbPool->get('core')->prefix . 'workflow_element_task_ibfk_2` FOREIGN KEY (`workflow_element_task_workflow_element`) REFERENCES `' . $dbPool->get('core')->prefix . 'workflow_element` (`workflow_element_id`);' ADD CONSTRAINT `' . $dbPool->get()->prefix . 'workflow_element_task_ibfk_2` FOREIGN KEY (`workflow_element_task_workflow_element`) REFERENCES `' . $dbPool->get()->prefix . 'workflow_element` (`workflow_element_id`);'
)->execute(); )->execute();
break; break;
} }

View File

@ -40,7 +40,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(
'task_element', 'task_element',
'task_account', 'task_account',
'task' 'task'