jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

run migrations always in kimai:install command (#944)

Browse Source
This commit is contained in:
Kevin Papst
2019-07-10 19:19:03 +02:00
committed by GitHub
parent 8a1d28563d
commit f23dcbec17
6 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Command/InstallCommand.php
View File

@@ -224,17 +224,28 @@ class InstallCommand extends Command
protected function importMigrations(SymfonyStyle $io, OutputInterface $output)
{
if ($this->connection->getSchemaManager()->tablesExist(['migration_versions'])) {
$amount = $this->connection->executeQuery('SELECT count(*) as counter FROM migration_versions')->fetchColumn(0);
if ($amount > 0) {
$io->note(sprintf('Found %s migrations in your database, skipping import', $amount));
if (!$this->connection->getSchemaManager()->tablesExist(['migration_versions'])) {
$command = $this->getApplication()->find('doctrine:migrations:version');
$cmdInput = new ArrayInput(['--add' => true, '--all' => true]);
$cmdInput->setInteractive(false);
$command->run($cmdInput, $output);
return;
}
return;
}
$command = $this->getApplication()->find('doctrine:migrations:version');
$cmdInput = new ArrayInput(['--add' => true, '--all' => true]);
// this case should not happen, but you know ... everything is possible
$amount = $this->connection->executeQuery('SELECT count(*) as counter FROM migration_versions')->fetchColumn(0);
if ($amount === 0) {
$command = $this->getApplication()->find('doctrine:migrations:version');
$cmdInput = new ArrayInput(['--add' => true, '--all' => true]);
$cmdInput->setInteractive(false);
$command->run($cmdInput, $output);
return;
}
$command = $this->getApplication()->find('doctrine:migrations:migrate');
$cmdInput = new ArrayInput(['--allow-no-migration' => true]);
$cmdInput->setInteractive(false);
$command->run($cmdInput, $output);

12
src/Repository/ActivityRepository.php
View File

@@ -81,6 +81,18 @@ class ActivityRepository extends EntityRepository
return $stats;
}
/**
* @deprecated since 1.1
*/
public function builderForEntityType($activity, $project)
{
$query = new ActivityFormTypeQuery();
$query->setActivity($activity);
$query->setProject($project);
return $this->getQueryBuilderForFormType($query);
}
/**
* Returns a query builder that is used for ActivityType and your own 'query_builder' option.
*

11
src/Repository/CustomerRepository.php
View File

@@ -107,6 +107,17 @@ class CustomerRepository extends EntityRepository
return $stats;
}
/**
* @deprecated since 1.1
*/
public function builderForEntityType($customer)
{
$query = new CustomerFormTypeQuery();
$query->setCustomer($customer);
return $this->getQueryBuilderForFormType($query);
}
/**
* Returns a query builder that is used for CustomerType and your own 'query_builder' option.
*

12
src/Repository/ProjectRepository.php
View File

@@ -91,6 +91,18 @@ class ProjectRepository extends EntityRepository
return $stats;
}
/**
* @deprecated since 1.1
*/
public function builderForEntityType($project, $customer)
{
$query = new ProjectFormTypeQuery();
$query->setProject($project);
$query->setCustomer($customer);
return $this->getQueryBuilderForFormType($query);
}
/**
* Returns a query builder that is used for ProjectType and your own 'query_builder' option.
*