Fixed error with migrate command (closes #115)

sergix44 · Dec 4, 2019 · 3b7e2fa · 3b7e2fa
1 parent 3b8eba3
commit 3b7e2fa
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v.3.0.2
++ Fixed error with migrate command.
++ Updated translations.
+
 ## v.3.0.1
 + Fixed error with older mysql versions.
 + Fixed config is compiled with the di container.

diff --git a/app/helpers.php b/app/helpers.php
@@ -436,13 +436,14 @@ function glob_recursive($pattern, $flags = 0)
     /**
      * Return the database DSN from config.
      *
-     * @param array $config
+     * @param  array  $config
      *
+     * @param  string  $baseDir
      * @return string
      */
-    function dsnFromConfig(array $config): string
+    function dsnFromConfig(array $config, $baseDir = BASE_DIR): string
     {
-        $dsn = $config['db']['connection'] === 'sqlite' ? BASE_DIR.$config['db']['dsn'] : $config['db']['dsn'];
+        $dsn = $config['db']['connection'] === 'sqlite' ? $baseDir.$config['db']['dsn'] : $config['db']['dsn'];
 
         return $config['db']['connection'].':'.$dsn;
     }

diff --git a/bin/migrate b/bin/migrate
@@ -24,7 +24,7 @@ if ($config['db']['connection'] === 'sqlite' && !file_exists(__DIR__.'/../'.$con
     $firstMigrate = true;
 }
 
-$db = new DB(dsnFromConfig($config), $config['db']['username'], $config['db']['password']);
+$db = new DB(dsnFromConfig($config, getcwd().DIRECTORY_SEPARATOR), $config['db']['username'], $config['db']['password']);
 
 $migrator = new Migrator($db, 'resources/schemas', $firstMigrate);
 $migrator->migrate();

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "sergix44/xbackbone",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A lightweight ShareX PHP backend",
   "type": "project",
   "require": {