diff --git a/src/Propel/Generator/Builder/Om/QueryBuilder.php b/src/Propel/Generator/Builder/Om/QueryBuilder.php
index 156d149422..0b229490c1 100644
--- a/src/Propel/Generator/Builder/Om/QueryBuilder.php
+++ b/src/Propel/Generator/Builder/Om/QueryBuilder.php
@@ -2033,7 +2033,7 @@ public function delete(?ConnectionInterface \$con = null): int
         ";
 
         $script .= "
-            \$affectedRows += ModelCriteria::delete(\$con);
+            \$affectedRows += parent::delete(\$con);
             {$this->getTableMapClassName()}::clearRelatedInstancePool();
 
             return \$affectedRows;
diff --git a/src/Propel/Generator/Reverse/MysqlSchemaParser.php b/src/Propel/Generator/Reverse/MysqlSchemaParser.php
index 0e1350739b..07f1f370da 100644
--- a/src/Propel/Generator/Reverse/MysqlSchemaParser.php
+++ b/src/Propel/Generator/Reverse/MysqlSchemaParser.php
@@ -237,7 +237,7 @@ public function getColumnFromRow(array $row, Table $table): Column
         $/x';
         if (preg_match($regexp, $row['Type'], $matches)) {
             $nativeType = $matches[1];
-            if ($matches[2]) {
+            if (strlen(trim($matches[2])) > 0) {
                 $cpos = strpos($matches[2], ',');
                 if ($cpos !== false) {
                     $size = (int)substr($matches[2], 0, $cpos);
@@ -246,7 +246,7 @@ public function getColumnFromRow(array $row, Table $table): Column
                     $size = (int)$matches[2];
                 }
             }
-            if ($matches[3]) {
+            if (strlen($matches[3]) > 0) {
                 $sqlType = $row['Type'];
             }
             if (isset(static::$defaultTypeSizes[$nativeType]) && $scale == null && $size === static::$defaultTypeSizes[$nativeType]) {
diff --git a/tests/Fixtures/schemas/schema.xml b/tests/Fixtures/schemas/schema.xml
index 4c41ec2b8a..78cbc3b242 100644
--- a/tests/Fixtures/schemas/schema.xml
+++ b/tests/Fixtures/schemas/schema.xml
@@ -89,7 +89,6 @@
             <reference local="customer_id" foreign="id"/>
         </foreign-key>
         <foreign-key foreignTable="bookstore_contest" onDelete="cascade">
-            <reference local="bookstore_id" foreign="bookstore_id"/>
             <reference local="contest_id" foreign="id"/>
         </foreign-key>
     </table>