sqlite: separate name and fileName in config

linkorb · Feb 8, 2017 · e97ab41 · e97ab41
1 parent aeeb283
commit e97ab41
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Config.php b/src/Config.php
@@ -15,6 +15,7 @@ class Config
     protected $address;
     protected $port = 3306;
     protected $properties = [];
+    protected $fileName;
 
     public function getName()
     {
@@ -111,6 +112,17 @@ public function setDriver($driver)
         return $this;
     }
 
+    public function getFileName()
+    {
+        return $this->fileName;
+    }
+
+    public function setFileName($fileName)
+    {
+        $this->fileName = $fileName;
+
+        return $this;
+    }
 
     public function setProperty($key, $value)
     {

diff --git a/src/Connector.php b/src/Connector.php
@@ -28,7 +28,9 @@ public function getConfig($dsn)
             }
             $urlPath = parse_url($dsn, PHP_URL_PATH);
             if (parse_url($dsn, PHP_URL_SCHEME) == 'sqlite') {
-                $config->setName($urlPath);
+                $i = pathinfo($urlPath);
+                $config->setName($i['filename']);
+                $config->setFileName($urlPath);
             } else {
                 $config->setName(substr($urlPath, 1));
             }
@@ -87,7 +89,7 @@ public function getPdoDsn(Config $config, $mode = 'db')
                 }
                 break;
             case 'sqlite':
-                $pdoDsn .= $config->getName();
+                $pdoDsn .= $config->getFileName();
                 break;
             default:
                 throw new RuntimeException("Unsupported driver: " . $config->getDriver());