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

Bugfix importer (#145) (#146)

Browse Source 
* Fix importer #145
This commit is contained in:
Kevin Papst
2018-06-01 15:06:29 +02:00
committed by GitHub
parent 4af0e277b4
commit 1c0f8cdad1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -105,7 +105,7 @@ The database to use is up to you, but we would not recommend using the default S
Please create your database and configure the connection string in your environment, e.g. with the `.env` file: Please create your database and configure the connection string in your environment, e.g. with the `.env` file:
``` ```
APP_ENV=prod APP_ENV=prod
DATABASE_URL=sqlitemysql://db_user:db_password@127.0.0.1:3306/db_name DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name
APP_SECRET=insert_a_random_secret_string_for_production APP_SECRET=insert_a_random_secret_string_for_production
``` ```

4
src/Command/KimaiImporterCommand.php
View File

@@ -293,8 +293,8 @@ class KimaiImporterCommand extends Command
*/ */
protected function checkDatabaseVersion(SymfonyStyle $io, $requiredVersion, $requiredRevision) protected function checkDatabaseVersion(SymfonyStyle $io, $requiredVersion, $requiredRevision)
{ {
$versionQuery = 'SELECT value from ' . $this->dbPrefix . 'configuration WHERE option = "version"'; $versionQuery = 'SELECT `value` from ' . $this->dbPrefix . 'configuration WHERE `option` = "version"';
$revisionQuery = 'SELECT value from ' . $this->dbPrefix . 'configuration WHERE option = "revision"'; $revisionQuery = 'SELECT `value` from ' . $this->dbPrefix . 'configuration WHERE `option` = "revision"';
$version = $this->getImportConnection()->query($versionQuery)->fetchColumn(); $version = $this->getImportConnection()->query($versionQuery)->fetchColumn();
$revision = $this->getImportConnection()->query($revisionQuery)->fetchColumn(); $revision = $this->getImportConnection()->query($revisionQuery)->fetchColumn();