Merge pull request #28 from byjg/4.1.0

4.1.0

composer.json

@@ -10,7 +10,7 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "byjg/anydataset-db": "4.0.*",
+    "byjg/anydataset-db": "4.1.*",
     "ext-pdo": "*"
   },
   "require-dev": {

src/Database/AbstractDatabase.php

@@ -121,4 +121,24 @@ public function updateVersionTable()
         $this->createVersion();
         $this->setVersion($currentVersion, Migration::VERSION_STATUS_UNKNOWN);
     }
+
+    protected function isTableExists($schema, $table)
+    {
+        $count = $this->getDbDriver()->getScalar(
+            'SELECT count(*) FROM information_schema.tables ' .
+            ' WHERE table_schema = [[schema]] ' .
+            '  AND table_name = [[table]] ',
+            [
+                "schema" => $schema,
+                "table" => $table
+            ]
+        );
+
+        return (intval($count) !== 0);
+    }
+
+    public function isDatabaseVersioned()
+    {
+        return $this->isTableExists(ltrim($this->getDbDriver()->getUri()->getPath(), "/"), $this->getMigrationTable());
+    }
 }

src/Database/DatabaseInterface.php

@@ -27,6 +27,8 @@ public function setVersion($version, $status);
 
     public function createVersion();
 
+    public function isDatabaseVersioned();
+
     public function getDbDriver();
 
     public function getMigrationTable();

src/Database/PgsqlDatabase.php

@@ -80,4 +80,9 @@ protected function executeSqlInternal($sql)
         }
         $this->getDbDriver()->execute($sql);
     }
+
+    public function isDatabaseVersioned()
+    {
+        return $this->isTableExists('public', $this->getMigrationTable());
+    }
 }

src/Database/SqliteDatabase.php

@@ -53,4 +53,21 @@ protected function executeSqlInternal($sql)
     {
         $this->getDbDriver()->execute($sql);
     }
+
+    protected function isTableExists($schema, $table)
+    {
+        $count = $this->getDbDriver()->getScalar(
+            "SELECT count(*) FROM sqlite_master WHERE type='table' AND name=[[table]]",
+            [
+                "table" => $table
+            ]
+        );
+
+        return (intval($count) !== 0);
+    }
+
+    public function isDatabaseVersioned()
+    {
+        return $this->isTableExists(null, $this->getMigrationTable());
+    }
 }

src/Migration.php

@@ -101,6 +101,11 @@ public function getDbCommand()
         return $this->dbCommand;
     }
 
+    public function getMigrationTable()
+    {
+        return $this->migrationTable;
+    }
+
     /**
      * @return mixed
      * @throws \ByJG\DbMigration\Exception\DatabaseDoesNotRegistered
@@ -346,4 +351,9 @@ public function addCallbackProgress(callable $callable)
     {
         $this->callableProgress = $callable;
     }
+
+    public function isDatabaseVersioned()
+    {
+        return $this->getDbCommand()->isDatabaseVersioned();
+    }
 }

tests/BaseDatabase.php

@@ -45,6 +45,13 @@ public function testVersion0()
         $this->assertVersion0();
     }
 
+    public function testIsDatabaseVersioned()
+    {
+        $this->assertFalse($this->migrate->isDatabaseVersioned());
+        $this->migrate->reset();
+        $this->assertTrue($this->migrate->isDatabaseVersioned());
+    }
+
     /**
      * @throws \ByJG\DbMigration\Exception\DatabaseDoesNotRegistered
      * @throws \ByJG\DbMigration\Exception\DatabaseIsIncompleteException