From a426ec56c0cfb2c902ae93b7325b532a49c93841 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Thu, 7 Oct 2010 16:13:54 +0000 Subject: [PATCH] Support conversion of floating-point MySQL types in DatabaseSqlite::sourceStream() --- includes/db/DatabaseSqlite.php | 4 +++- maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php index b691d83136..faadb0bde5 100644 --- a/includes/db/DatabaseSqlite.php +++ b/includes/db/DatabaseSqlite.php @@ -606,7 +606,9 @@ class DatabaseSqlite extends DatabaseBase { // no such thing as unsigned $s = preg_replace( '/\b(un)?signed\b/i', '', $s ); // INT -> INTEGER - $s = preg_replace( '/\b(tiny|small|medium|big|)int(\s*\([\s\d]*\)|\b)/i', 'INTEGER', $s ); + $s = preg_replace( '/\b(tiny|small|medium|big|)int(\s*\(\s*\d+\s*\)|\b)/i', 'INTEGER', $s ); + // floating point types -> REAL + $s = preg_replace( '/\b(float|double(\s+precision)?)(\s*\(\s*\d+\s*(,\s*\d+\s*)?\)|\b)/i', 'REAL', $s ); // varchar -> TEXT $s = preg_replace( '/\b(var)?char\s*\(.*?\)/i', 'TEXT', $s ); // TEXT normalization diff --git a/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php b/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php index e1a21f6fc4..252a3ac77e 100644 --- a/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php +++ b/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php @@ -44,6 +44,10 @@ class DatabaseSqliteTest extends PHPUnit_Framework_TestCase { foo_bar char(13), foo_name varchar(255) binary NOT NULL DEFAULT '', foo_int tinyint ( 8 ), foo_int2 int(16) ) ENGINE=MyISAM;" ) ); + $this->assertEquals( "CREATE TABLE foo ( foo1 REAL, foo2 REAL, foo3 REAL );", + $this->replaceVars( "CREATE TABLE foo ( foo1 FLOAT, foo2 DOUBLE( 1,10), foo3 DOUBLE PRECISION );" ) + ); + $this->assertEquals( "CREATE TABLE foo ( foo_binary1 BLOB, foo_binary2 BLOB );", $this->replaceVars( "CREATE TABLE foo ( foo_binary1 binary(16), foo_binary2 varbinary(32) );" ) ); -- 2.20.1