@@ -636,16 +636,17 @@ private function filterWithJoin(array $options): array|AbstractModel {
636636
637637 while ($ row = $ stmt ->fetch (PDO ::FETCH_ASSOC )) {
638638 foreach ($ row as $ k => $ v ) {
639+ $ k = strtolower ($ k );
639640 foreach ($ factories as $ factory ) {
640- if (Util::startsWith ($ k , $ factory ->getMappedModelTable ())) {
641- $ column = str_replace ($ factory ->getMappedModelTable () . ". " , "" , $ k );
642- $ values [$ factory ->getModelTable ()][$ column ] = $ v ;
641+ if (Util::startsWith ($ k , strtolower ( $ factory ->getMappedModelTable () ))) {
642+ $ column = str_replace (strtolower ( $ factory ->getMappedModelTable () ) . ". " , "" , $ k );
643+ $ values [$ factory ->getModelTable ()][strtolower ( $ column) ] = $ v ;
643644 }
644645 }
645646 }
646647
647648 foreach ($ factories as $ factory ) {
648- $ model = $ factory ->createObjectFromDict ($ values [$ factory ->getModelTable ()][$ factory ->getNullObject ()->getPrimaryKey ()], $ values [$ factory ->getModelTable ()]);
649+ $ model = $ factory ->createObjectFromDict ($ values [$ factory ->getModelTable ()][strtolower ( $ factory ->getNullObject ()->getPrimaryKey () )], $ values [$ factory ->getModelTable ()]);
649650 $ res [$ factory ->getModelTable ()][] = $ model ;
650651 }
651652 }
@@ -698,7 +699,12 @@ public function filter(array $options, bool $single = false) {
698699 while ($ row = $ stmt ->fetch (PDO ::FETCH_ASSOC )) {
699700 $ pkName = $ this ->getNullObject ()->getPrimaryKey ();
700701
701- $ pk = $ row [$ pkName ];
702+ if (isset ($ row [strtolower ($ pkName )])) {
703+ $ pk = $ row [strtolower ($ pkName )];
704+ }
705+ else {
706+ $ pk = $ row [$ pkName ];
707+ }
702708 $ model = $ this ->createObjectFromDict ($ pk , $ row );
703709 $ objects [] = $ model ;
704710 }
0 commit comments