Merge pull request #12 from moufmouf/bugfix/quotedcolumns

Fixing bug in quoted columns (on Oracle)
thecodingmachine · Aug 1, 2020 · bb3e99e · bb3e99e
2 parents ec47fa6 + d0ba8ef
commit bb3e99e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: php
 
 php:
- - 5.5
  - 5.6
  - 7.0
+ - 7.4
 
 env:
   matrix:

diff --git a/composer.json b/composer.json
@@ -15,12 +15,12 @@
     },
     "require": {
         "clue/graph": "~0.9.0",
-        "doctrine/dbal": "~2.4",
+        "doctrine/dbal": "~2.5",
         "doctrine/cache": "^1.4.1",
         "graphp/algorithms": "~0.8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "satooshi/php-coveralls": "dev-master"
+        "phpunit/phpunit": "^4.8.36",
+        "satooshi/php-coveralls": "^1.0"
     }
 }
diff --git a/src/SchemaAnalyzer.php b/src/SchemaAnalyzer.php
@@ -139,7 +139,7 @@ public function isJunctionTable(Table $table, $ignoreReferencedTables = false)
         }
 
         if ($table->hasPrimaryKey()) {
-            $pkColumns = $table->getPrimaryKeyColumns();
+            $pkColumns = $table->getPrimaryKey()->getUnquotedColumns();
         } else {
             $pkColumns = [];
         }
@@ -513,8 +513,8 @@ private function isInheritanceRelationship(ForeignKeyConstraint $fk)
         if (!$fk->getLocalTable()->hasPrimaryKey()) {
             return false;
         }
-        $fkColumnNames = $fk->getLocalColumns();
-        $pkColumnNames = $fk->getLocalTable()->getPrimaryKeyColumns();
+        $fkColumnNames = $fk->getUnquotedLocalColumns();
+        $pkColumnNames = $fk->getLocalTable()->getPrimaryKey()->getUnquotedColumns();
 
         sort($fkColumnNames);
         sort($pkColumnNames);