| Index: branches/REL1_17/phase3/includes/db/DatabaseSqlite.php |
| — | — | @@ -584,6 +584,8 @@ |
| 585 | 585 | $s = preg_replace( '/\bauto_increment\b/i', 'AUTOINCREMENT', $s ); |
| 586 | 586 | // No explicit options |
| 587 | 587 | $s = preg_replace( '/\)[^);]*(;?)\s*$/', ')\1', $s ); |
| | 588 | + // AUTOINCREMENT should immedidately follow PRIMARY KEY |
| | 589 | + $s = preg_replace( '/primary key (.*?) autoincrement/i', 'PRIMARY KEY AUTOINCREMENT $1', $s ); |
| 588 | 590 | } elseif ( preg_match( '/^\s*CREATE (\s*(?:UNIQUE|FULLTEXT)\s+)?INDEX/i', $s ) ) { |
| 589 | 591 | // No truncated indexes |
| 590 | 592 | $s = preg_replace( '/\(\d+\)/', '', $s ); |
| Property changes on: branches/REL1_17/phase3/includes/db |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 591 | 593 | Merged /trunk/phase3/includes/db:r85752 |
| Property changes on: branches/REL1_17/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 592 | 594 | Merged /trunk/phase3/includes:r85752 |
| Property changes on: branches/REL1_17/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 593 | 595 | Merged /trunk/phase3:r85752 |