File tree Expand file tree Collapse file tree 3 files changed +25
-3
lines changed
src/Symfony/Component/Messenger/Bridge/Doctrine Expand file tree Collapse file tree 3 files changed +25
-3
lines changed Original file line number Diff line number Diff line change 29
29
use Doctrine \DBAL \Query \QueryBuilder ;
30
30
use Doctrine \DBAL \Result ;
31
31
use Doctrine \DBAL \Schema \AbstractSchemaManager ;
32
+ use Doctrine \DBAL \Schema \NamedObject ;
32
33
use Doctrine \DBAL \Schema \Schema ;
33
34
use Doctrine \DBAL \Schema \SchemaConfig ;
34
35
use PHPUnit \Framework \MockObject \MockObject ;
@@ -876,7 +877,14 @@ public function testConfigureSchemaOracleSequenceNameSuffixed()
876
877
$ sequences = $ schema ->getSequences ();
877
878
$ this ->assertCount (1 , $ sequences );
878
879
$ sequence = array_pop ($ sequences );
879
- $ sequenceNameSuffix = substr ($ sequence ->getName (), -\strlen ($ expectedSuffix ));
880
+ if ($ sequence instanceof NamedObject) {
881
+ // DBAL 4.4+
882
+ $ sequenceName = $ sequence ->getObjectName ()->toString ();
883
+ } else {
884
+ // DBAL < 4.4
885
+ $ sequenceName = $ sequence ->getName ();
886
+ }
887
+ $ sequenceNameSuffix = substr ($ sequenceName , -\strlen ($ expectedSuffix ));
880
888
$ this ->assertSame ($ expectedSuffix , $ sequenceNameSuffix );
881
889
}
882
890
}
Original file line number Diff line number Diff line change 16
16
use Doctrine \DBAL \DriverManager ;
17
17
use Doctrine \DBAL \Schema \Column ;
18
18
use Doctrine \DBAL \Schema \DefaultSchemaManagerFactory ;
19
+ use Doctrine \DBAL \Schema \NamedObject ;
19
20
use Doctrine \DBAL \Schema \Sequence ;
20
21
use Doctrine \DBAL \Schema \Table ;
21
22
use Doctrine \DBAL \Tools \DsnParser ;
@@ -109,7 +110,15 @@ private function hasSequence(string $name): bool
109
110
110
111
$ sequences = $ schemaManager ->listSequences ();
111
112
foreach ($ sequences as $ sequence ) {
112
- if ($ sequence ->getName () === $ name ) {
113
+ if ($ sequence instanceof NamedObject) {
114
+ // DBAL 4.4+
115
+ $ sequenceName = $ sequence ->getObjectName ()->toString ();
116
+ } else {
117
+ // DBAL < 4.4
118
+ $ sequenceName = $ sequence ->getName ();
119
+ }
120
+
121
+ if ($ sequenceName === $ name ) {
113
122
return true ;
114
123
}
115
124
}
Original file line number Diff line number Diff line change 25
25
use Doctrine \DBAL \Schema \AbstractAsset ;
26
26
use Doctrine \DBAL \Schema \Name \Identifier ;
27
27
use Doctrine \DBAL \Schema \Name \UnqualifiedName ;
28
+ use Doctrine \DBAL \Schema \NamedObject ;
28
29
use Doctrine \DBAL \Schema \PrimaryKeyConstraint ;
29
30
use Doctrine \DBAL \Schema \AbstractSchemaManager ;
30
31
use Doctrine \DBAL \Schema \Comparator ;
@@ -325,7 +326,11 @@ public function setup(): void
325
326
$ configuration = $ this ->driverConnection ->getConfiguration ();
326
327
$ assetFilter = $ configuration ->getSchemaAssetsFilter ();
327
328
$ configuration ->setSchemaAssetsFilter (function ($ tableName ) {
328
- if ($ tableName instanceof AbstractAsset) {
329
+ if ($ tableName instanceof NamedObject) {
330
+ // DBAL 4.4+
331
+ $ tableName = $ tableName ->getObjectName ()->toString ();
332
+ } elseif ($ tableName instanceof AbstractAsset) {
333
+ // DBAL < 4.4
329
334
$ tableName = $ tableName ->getName ();
330
335
}
331
336
You can’t perform that action at this time.
0 commit comments