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 2929use Doctrine \DBAL \Query \QueryBuilder ;
3030use Doctrine \DBAL \Result ;
3131use Doctrine \DBAL \Schema \AbstractSchemaManager ;
32+ use Doctrine \DBAL \Schema \NamedObject ;
3233use Doctrine \DBAL \Schema \Schema ;
3334use Doctrine \DBAL \Schema \SchemaConfig ;
3435use PHPUnit \Framework \Attributes \DataProvider ;
@@ -871,7 +872,14 @@ public function testConfigureSchemaOracleSequenceNameSuffixed()
871872 $ sequences = $ schema ->getSequences ();
872873 $ this ->assertCount (1 , $ sequences );
873874 $ sequence = array_pop ($ sequences );
874- $ sequenceNameSuffix = substr ($ sequence ->getName (), -\strlen ($ expectedSuffix ));
875+ if ($ sequence instanceof NamedObject) {
876+ // DBAL 4.4+
877+ $ sequenceName = $ sequence ->getObjectName ()->toString ();
878+ } else {
879+ // DBAL < 4.4
880+ $ sequenceName = $ sequence ->getName ();
881+ }
882+ $ sequenceNameSuffix = substr ($ sequenceName , -\strlen ($ expectedSuffix ));
875883 $ this ->assertSame ($ expectedSuffix , $ sequenceNameSuffix );
876884 }
877885}
Original file line number Diff line number Diff line change 1616use Doctrine \DBAL \DriverManager ;
1717use Doctrine \DBAL \Schema \Column ;
1818use Doctrine \DBAL \Schema \DefaultSchemaManagerFactory ;
19+ use Doctrine \DBAL \Schema \NamedObject ;
1920use Doctrine \DBAL \Schema \Sequence ;
2021use Doctrine \DBAL \Schema \Table ;
2122use Doctrine \DBAL \Tools \DsnParser ;
@@ -111,7 +112,15 @@ private function hasSequence(string $name): bool
111112
112113 $ sequences = $ schemaManager ->listSequences ();
113114 foreach ($ sequences as $ sequence ) {
114- if ($ sequence ->getName () === $ name ) {
115+ if ($ sequence instanceof NamedObject) {
116+ // DBAL 4.4+
117+ $ sequenceName = $ sequence ->getObjectName ()->toString ();
118+ } else {
119+ // DBAL < 4.4
120+ $ sequenceName = $ sequence ->getName ();
121+ }
122+
123+ if ($ sequenceName === $ name ) {
115124 return true ;
116125 }
117126 }
Original file line number Diff line number Diff line change 2626use Doctrine \DBAL \Schema \ComparatorConfig ;
2727use Doctrine \DBAL \Schema \Name \Identifier ;
2828use Doctrine \DBAL \Schema \Name \UnqualifiedName ;
29+ use Doctrine \DBAL \Schema \NamedObject ;
2930use Doctrine \DBAL \Schema \PrimaryKeyConstraint ;
3031use Doctrine \DBAL \Schema \Schema ;
3132use Doctrine \DBAL \Schema \Table ;
@@ -323,7 +324,11 @@ public function setup(): void
323324 $ configuration = $ this ->driverConnection ->getConfiguration ();
324325 $ assetFilter = $ configuration ->getSchemaAssetsFilter ();
325326 $ configuration ->setSchemaAssetsFilter (function ($ tableName ) {
326- if ($ tableName instanceof AbstractAsset) {
327+ if ($ tableName instanceof NamedObject) {
328+ // DBAL 4.4+
329+ $ tableName = $ tableName ->getObjectName ()->toString ();
330+ } elseif ($ tableName instanceof AbstractAsset) {
331+ // DBAL < 4.4
327332 $ tableName = $ tableName ->getName ();
328333 }
329334
You can’t perform that action at this time.
0 commit comments