Skip to content

Commit 0ef3ce0

Browse files
tasselchofleeqvip
andauthored
feat: Added doctrine/dbal v4.0. (#7)
* #6 Added doctrine/dbal v4.0. * fix: Apply suggestions from code review --------- Co-authored-by: Jon <[email protected]>
1 parent 935a7fb commit 0ef3ce0

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"license": "Apache-2.0",
2020
"require": {
2121
"casbin/casbin": "^3.0",
22-
"doctrine/dbal": "^2.9|^3.0"
22+
"doctrine/dbal": "^2.9|^3.0|^4.0"
2323
},
2424
"require-dev": {
2525
"phpunit/phpunit": "~7.0|~8.0",

src/Adapter.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static function newAdapter($connection): Adapter
9797
*/
9898
public function initTable()
9999
{
100-
$sm = $this->connection->getSchemaManager();
100+
$sm = method_exists($this->connection, "createSchemaManager") ? $sm = $this->connection->createSchemaManager() : $sm = $this->connection->getSchemaManager();
101101
if (!$sm->tablesExist([$this->policyTableName])) {
102102
$schema = new Schema();
103103
$table = $schema->createTable($this->policyTableName);
@@ -147,7 +147,8 @@ public function savePolicyLine($pType, array $rule)
147147
public function loadPolicy(Model $model): void
148148
{
149149
$queryBuilder = $this->connection->createQueryBuilder();
150-
$stmt = $queryBuilder->select('p_type', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->from($this->policyTableName)->execute();
150+
$query = $queryBuilder->select('p_type', 'v0', 'v1', 'v2', 'v3', 'v4', 'v5')->from($this->policyTableName);
151+
$stmt = method_exists($query, "executeQuery") ? $query->executeQuery() : $query->execute();
151152

152153
while ($row = $this->fetch($stmt)) {
153154
$this->loadPolicyArray($this->filterRule($row), $model);

0 commit comments

Comments
 (0)