Skip to content

Commit bb3e99e

Browse files
authored
Merge pull request #12 from moufmouf/bugfix/quotedcolumns
Fixing bug in quoted columns (on Oracle)
2 parents ec47fa6 + d0ba8ef commit bb3e99e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: php
22

33
php:
4-
- 5.5
54
- 5.6
65
- 7.0
6+
- 7.4
77

88
env:
99
matrix:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
},
1616
"require": {
1717
"clue/graph": "~0.9.0",
18-
"doctrine/dbal": "~2.4",
18+
"doctrine/dbal": "~2.5",
1919
"doctrine/cache": "^1.4.1",
2020
"graphp/algorithms": "~0.8.0"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "~4.0",
24-
"satooshi/php-coveralls": "dev-master"
23+
"phpunit/phpunit": "^4.8.36",
24+
"satooshi/php-coveralls": "^1.0"
2525
}
2626
}

src/SchemaAnalyzer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function isJunctionTable(Table $table, $ignoreReferencedTables = false)
139139
}
140140

141141
if ($table->hasPrimaryKey()) {
142-
$pkColumns = $table->getPrimaryKeyColumns();
142+
$pkColumns = $table->getPrimaryKey()->getUnquotedColumns();
143143
} else {
144144
$pkColumns = [];
145145
}
@@ -513,8 +513,8 @@ private function isInheritanceRelationship(ForeignKeyConstraint $fk)
513513
if (!$fk->getLocalTable()->hasPrimaryKey()) {
514514
return false;
515515
}
516-
$fkColumnNames = $fk->getLocalColumns();
517-
$pkColumnNames = $fk->getLocalTable()->getPrimaryKeyColumns();
516+
$fkColumnNames = $fk->getUnquotedLocalColumns();
517+
$pkColumnNames = $fk->getLocalTable()->getPrimaryKey()->getUnquotedColumns();
518518

519519
sort($fkColumnNames);
520520
sort($pkColumnNames);

0 commit comments

Comments
 (0)