Skip to content

Commit 7e9c7df

Browse files
author
Bizley
authored
Fixed removePkAppend (#85)
1 parent b067107 commit 7e9c7df

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/table/TableColumn.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use function implode;
1313
use function in_array;
1414
use function is_array;
15-
use function mb_strtoupper;
1615
use function preg_match;
1716
use function preg_replace;
17+
use function str_ireplace;
1818
use function str_repeat;
1919
use function str_replace;
2020
use function stripos;
@@ -248,7 +248,8 @@ public function isColumnAppendPK(): bool
248248
}
249249

250250
if ($this->schema === TableStructure::SCHEMA_MSSQL) {
251-
if (stripos($this->append, 'IDENTITY') !== false
251+
if (
252+
stripos($this->append, 'IDENTITY') !== false
252253
&& stripos($this->append, 'PRIMARY KEY') !== false
253254
) {
254255
return true;
@@ -308,34 +309,34 @@ public function escapeQuotes(string $value): string
308309
public function removePKAppend(): ?string
309310
{
310311
if (!$this->isColumnAppendPK()) {
311-
return null;
312+
return $this->append;
312313
}
313314

314-
$uppercaseAppend = preg_replace('/\s+/', ' ', mb_strtoupper($this->append, 'UTF-8'));
315+
$append = preg_replace('/\s+/', ' ', $this->append);
315316

316317
switch ($this->schema) {
317318
case TableStructure::SCHEMA_MSSQL:
318-
$formattedAppend = str_replace(['PRIMARY KEY', 'IDENTITY'], '', $uppercaseAppend);
319+
$filteredAppend = str_ireplace(['PRIMARY KEY', 'IDENTITY'], '', $append);
319320
break;
320321

321322
case TableStructure::SCHEMA_OCI:
322323
case TableStructure::SCHEMA_PGSQL:
323-
$formattedAppend = str_replace('PRIMARY KEY', '', $uppercaseAppend);
324+
$filteredAppend = str_ireplace('PRIMARY KEY', '', $append);
324325
break;
325326

326327
case TableStructure::SCHEMA_SQLITE:
327-
$formattedAppend = str_replace(['PRIMARY KEY', 'AUTOINCREMENT'], '', $uppercaseAppend);
328+
$filteredAppend = str_ireplace(['PRIMARY KEY', 'AUTOINCREMENT'], '', $append);
328329
break;
329330

330331
case TableStructure::SCHEMA_CUBRID:
331332
case TableStructure::SCHEMA_MYSQL:
332333
default:
333-
$formattedAppend = str_replace(['PRIMARY KEY', 'AUTO_INCREMENT'], '', $uppercaseAppend);
334+
$filteredAppend = str_ireplace(['PRIMARY KEY', 'AUTO_INCREMENT'], '', $append);
334335
}
335336

336-
$formattedAppend = trim($formattedAppend);
337+
$filteredAppend = trim($filteredAppend);
337338

338-
return !empty($formattedAppend) ? $formattedAppend : null;
339+
return !empty($filteredAppend) ? $filteredAppend : null;
339340
}
340341

341342
/**

0 commit comments

Comments
 (0)