Fix: #1

Author: leeqvip

.gitignore

@@ -0,0 +1,9 @@
+/vendor/
+
+composer.lock
+
+.idea/
+*.iml
+
+# coverage report
+/build

README.md

@@ -6,8 +6,8 @@ the current supported databases are:
 
 | type | database |
 | ------ | ------ |
-| mysql | PostgreSQL |
-| pgsql | MySQL |
+| mysql | MySQL |
+| pgsql | PostgreSQL |
 | sqlite | SQLite |
 | sqlsrv | SqlServer |
 
@@ -57,4 +57,10 @@ if ($e->enforce($sub, $obj, $act) === true) {
 
 ### Getting Help
 
-- [php-casbin](https://github.com/php-casbin/php-casbin)
+- [php-casbin](https://github.com/php-casbin/php-casbin)
+
+### License
+
+This project is licensed under the [Apache 2.0 license](LICENSE).## License
+
+This project is licensed under the [Apache 2.0 license](LICENSE).

composer.json

@@ -10,8 +10,8 @@
     ],
     "license": "Apache-2.0",
     "require": {
-    	"casbin/casbin": "^0.1.0",
-        "techone/database": "^0.1.0"
+    	"casbin/casbin": ">=0.1.4",
+        "techone/database": ">=0.2.0"
     },
     "autoload": {
         "psr-4": {

src/Adapter.php

@@ -1,12 +1,15 @@
 <?php
+
 namespace CasbinAdapter\Database;
 
 use Casbin\Exceptions\CasbinException;
 use Casbin\Persist\Adapter as AdapterContract;
 use TechOne\Database\Manager;
 use Casbin\Persist\AdapterHelper;
+
 /**
- * DatabaseAdapter
+ * DatabaseAdapter.
+ *
  * @author [email protected]
  */
 class Adapter implements AdapterContract
@@ -21,7 +24,7 @@ class Adapter implements AdapterContract
 
     public function __construct(array $config)
     {
-        $this->config     = $config;
+        $this->config = $config;
         $this->connection = (new Manager($config))->getConnection();
         $this->initTable();
     }
@@ -33,7 +36,48 @@ public static function newAdapter(array $config)
 
     public function initTable()
     {
-        $sql = <<<EOT
+        if ('pgsql' == $this->config['type']) {
+            $sql = <<<EOT
+CREATE TABLE IF NOT EXISTS $this->casbinRuleTableName (
+  id bigserial NOT NULL,
+  ptype varchar(255) NOT NULL,
+  v0 varchar(255) DEFAULT NULL,
+  v1 varchar(255) DEFAULT NULL,
+  v2 varchar(255) DEFAULT NULL,
+  v3 varchar(255) DEFAULT NULL,
+  v4 varchar(255) DEFAULT NULL,
+  v5 varchar(255) DEFAULT NULL,
+  PRIMARY KEY (id)
+);
+EOT;
+        } elseif ('sqlite' == $this->config['type']) {
+            $sql = <<<EOT
+CREATE TABLE IF NOT EXISTS `$this->casbinRuleTableName` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT ,
+  `ptype` varchar(255) NOT NULL,
+  `v0` varchar(255) DEFAULT NULL,
+  `v1` varchar(255) DEFAULT NULL,
+  `v2` varchar(255) DEFAULT NULL,
+  `v3` varchar(255) DEFAULT NULL,
+  `v4` varchar(255) DEFAULT NULL,
+  `v5` varchar(255) DEFAULT NULL
+);
+EOT;
+        } elseif ('sqlsrv' == $this->config['type']) {
+            $sql = <<<EOT
+CREATE TABLE IF NOT EXISTS `$this->casbinRuleTableName` (
+  id int IDENTITY(1,1),
+  ptype varchar(255) NOT NULL,
+  v0 varchar(255) DEFAULT NULL,
+  v1 varchar(255) DEFAULT NULL,
+  v2 varchar(255) DEFAULT NULL,
+  v3 varchar(255) DEFAULT NULL,
+  v4 varchar(255) DEFAULT NULL,
+  v5 varchar(255) DEFAULT NULL
+);
+EOT;
+        } else {
+            $sql = <<<EOT
 CREATE TABLE IF NOT EXISTS `$this->casbinRuleTableName` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `ptype` varchar(255) NOT NULL,
@@ -46,29 +90,29 @@ public function initTable()
   PRIMARY KEY (`id`)
 );
 EOT;
+        }
         $this->connection->execute($sql, []);
     }
 
     public function savePolicyLine($ptype, array $rule)
     {
-
-        $col['`ptype`'] = $ptype;
+        $col['ptype'] = $ptype;
         foreach ($rule as $key => $value) {
-            $col['`v' . strval($key) . '`'] = $value;
+            $col['v'.strval($key).''] = $value;
         }
 
         $colStr = implode(', ', array_keys($col));
 
         $name = rtrim(str_repeat('?, ', count($col)), ', ');
 
-        $sql = 'INSERT INTO `' . $this->casbinRuleTableName . '`(' . $colStr . ') VALUES (' . $name . ') ';
+        $sql = 'INSERT INTO '.$this->casbinRuleTableName.'('.$colStr.') VALUES ('.$name.') ';
 
         $this->connection->execute($sql, array_values($col));
     }
 
     public function loadPolicy($model)
     {
-        $rows = $this->connection->query('SELECT * FROM `' . $this->casbinRuleTableName . '`');
+        $rows = $this->connection->query('SELECT * FROM '.$this->casbinRuleTableName.'');
 
         foreach ($rows as $row) {
             $line = implode(', ', array_slice(array_values($row), 1));
@@ -89,6 +133,7 @@ public function savePolicy($model)
                 $this->savePolicyLine($ptype, $rule);
             }
         }
+
         return true;
     }
 
@@ -100,22 +145,22 @@ public function addPolicy($sec, $ptype, $rule)
     public function removePolicy($sec, $ptype, $rule)
     {
         $where['ptype'] = $ptype;
-        $condition[]    = 'ptype = :ptype';
+        $condition[] = 'ptype = :ptype';
         foreach ($rule as $key => $value) {
-            $where['v' . strval($key)] = $value;
-            $condition[]               = 'v' . strval($key) . ' = :' . 'v' . strval($key);
+            $where['v'.strval($key)] = $value;
+            $condition[] = 'v'.strval($key).' = :'.'v'.strval($key);
         }
         if (empty($condition)) {
             return;
         }
 
-        $sql = 'DELETE FROM `' . $this->casbinRuleTableName . '` WHERE ' . implode(' AND ', $condition);
+        $sql = 'DELETE FROM '.$this->casbinRuleTableName.' WHERE '.implode(' AND ', $condition);
 
         return $this->connection->execute($sql, $where);
     }
 
     public function removeFilteredPolicy($sec, $ptype, $fieldIndex, ...$fieldValues)
     {
-        throw new CasbinException("not implemented");
+        throw new CasbinException('not implemented');
     }
 }