Updated casbin to 1.x .

Author: leeqvip

composer.json

@@ -1,30 +1,30 @@
-{
-    "name": "casbin/database-adapter",
-    "keywords": ["casbin", "database", "casbin-adapter"],
-    "description": "Database adapter for php-casbin. ",
-    "authors": [
-        {
-            "name": "TechLee",
-            "email": "[email protected]"
-        }
-    ],
-    "license": "Apache-2.0",
-    "require": {
-    	"casbin/casbin": ">=0.2",
-        "techone/database": ">=0.2.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~5.7|~6.0",
-        "php-coveralls/php-coveralls": "^2.1"
-    },
-    "autoload": {
-        "psr-4": {
-            "CasbinAdapter\\Database\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\": "tests/"
-        }
-    }
-}
+{
+    "name": "casbin/database-adapter",
+    "keywords": ["casbin", "database", "casbin-adapter"],
+    "description": "Database adapter for php-casbin. ",
+    "authors": [
+        {
+            "name": "TechLee",
+            "email": "[email protected]"
+        }
+    ],
+    "license": "Apache-2.0",
+    "require": {
+    	"casbin/casbin": "~1.0",
+        "techone/database": ">=0.2.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~5.7|~6.0|~7.0",
+        "php-coveralls/php-coveralls": "^2.1"
+    },
+    "autoload": {
+        "psr-4": {
+            "CasbinAdapter\\Database\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\": "tests/"
+        }
+    }
+}

src/Adapter.php

@@ -58,10 +58,12 @@ public function savePolicyLine($ptype, array $rule)
 
     public function loadPolicy($model)
     {
-        $rows = $this->connection->query('SELECT * FROM '.$this->casbinRuleTableName.'');
+        $rows = $this->connection->query('SELECT ptype, v0, v1, v2, v3, v4, v5 FROM '.$this->casbinRuleTableName.'');
 
         foreach ($rows as $row) {
-            $line = implode(', ', array_slice(array_values($row), 1));
+            $line = implode(', ', array_filter($row, function ($val) {
+                return '' != $val && !is_null($val);
+            }));
             $this->loadPolicyLine(trim($line), $model);
         }
     }