@@ -667,7 +667,7 @@ private function setupModuleRegistry(SchemaSetupInterface $setup)
667
667
$ columns = ['module ' => ['varchar(50) ' ,'' ],
668
668
'schema_version ' => ['varchar(50) ' ,'' ],
669
669
'data_version ' => ['varchar(50) ' ,'' ]];
670
- $ this ->updateDBTable ($ tableName , $ columns , $ connection );
670
+ $ this ->setColumnCollationAndCharset ($ tableName , $ columns , $ connection );
671
671
}
672
672
}
673
673
}
@@ -734,7 +734,7 @@ private function setupSessionTable(
734
734
if (preg_match ('/\b( ' . self ::OLDCHARSET .')\b/ ' , $ getTableSchema )) {
735
735
$ tableName = $ setup ->getTable ('session ' );
736
736
$ columns = ['session_id ' => ['varchar(255) ' ,'' ]];
737
- $ this ->updateDBTable ($ tableName , $ columns , $ connection );
737
+ $ this ->setColumnCollationAndCharset ($ tableName , $ columns , $ connection );
738
738
}
739
739
}
740
740
}
@@ -797,7 +797,7 @@ private function setupCacheTable(
797
797
if (preg_match ('/\b( ' . self ::OLDCHARSET .')\b/ ' , $ getTableSchema )) {
798
798
$ tableName = $ setup ->getTable ('cache ' );
799
799
$ columns = ['id ' => ['varchar(200) ' ,'' ]];
800
- $ this ->updateDBTable ($ tableName , $ columns , $ connection );
800
+ $ this ->setColumnCollationAndCharset ($ tableName , $ columns , $ connection );
801
801
}
802
802
}
803
803
}
@@ -842,7 +842,7 @@ private function setupCacheTagTable(
842
842
if (preg_match ('/\b( ' . self ::OLDCHARSET .')\b/ ' , $ getTableSchema )) {
843
843
$ tableName = $ setup ->getTable ('cache_tag ' );
844
844
$ columns = ['tag ' => ['varchar(100) ' ,'' ],'cache_id ' => ['varchar(200) ' ,'' ]];
845
- $ this ->updateDBTable ($ tableName , $ columns , $ connection );
845
+ $ this ->setColumnCollationAndCharset ($ tableName , $ columns , $ connection );
846
846
}
847
847
}
848
848
}
@@ -906,7 +906,7 @@ private function setupFlagTable(
906
906
$ getTableSchema = $ connection ->getCreateTable ($ tableName ) ?? '' ;
907
907
if (preg_match ('/\b( ' . self ::OLDCHARSET .')\b/ ' , $ getTableSchema )) {
908
908
$ columns = ['flag_code ' => ['varchar(255) ' ,'NOT NULL ' ],'flag_data ' => ['mediumtext ' ,'' ]];
909
- $ this ->updateDBTable ($ tableName , $ columns , $ connection );
909
+ $ this ->setColumnCollationAndCharset ($ tableName , $ columns , $ connection );
910
910
}
911
911
}
912
912
}
@@ -1891,7 +1891,7 @@ private function reindexAll(): void
1891
1891
* @param AdapterInterface $connection
1892
1892
* @return void
1893
1893
*/
1894
- private function updateDBTable (string $ tableName , array $ columns , $ connection ) : void
1894
+ private function setColumnCollationAndCharset (string $ tableName , array $ columns , $ connection ) : void
1895
1895
{
1896
1896
$ charset = $ this ->columnConfig ->getDefaultCharset ();
1897
1897
$ collate = $ this ->columnConfig ->getDefaultCollation ();
0 commit comments