wip

Author: JanJakes

tests/WP_SQLite_Information_Schema_Reconstructor_Tests.php

@@ -59,7 +59,12 @@ public function setUp(): void {
 		);
 	}
 
-	public function testReconstructTable(): void {
+	/**
+	 * @dataProvider dataPdoStringifyFetches
+	 */
+	public function testReconstructTableWithPdoStringifyFetches( bool $pdo_stringify_fetches ): void {
+		$this->engine->get_connection()->get_pdo()->setAttribute( PDO::ATTR_STRINGIFY_FETCHES, $pdo_stringify_fetches );
+
 		$this->engine->get_connection()->query(
 			'
 			CREATE TABLE t (
@@ -392,6 +397,13 @@ public function testInvalidDataTypeCacheDataForIndexDefinition(): void {
 		);
 	}
 
+	public function dataPdoStringifyFetches(): array {
+		return array(
+			'PDO::ATTR_STRINGIFY_FETCHES set to true'  => array( true ),
+			'PDO::ATTR_STRINGIFY_FETCHES set to false' => array( false ),
+		);
+	}
+
 	private function assertQuery( $sql ) {
 		$retval = $this->engine->query( $sql );
 		$this->assertNotFalse( $retval );

tests/WP_SQLite_Translator_Tests.php

@@ -3557,4 +3557,13 @@ public function testCreateTableWithDefaultNowFunction() {
 		$result = $this->assertQuery( 'SELECT * FROM test_now_default WHERE id = 2' );
 		$this->assertRegExp( '/\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d/', $result[0]->updated );
 	}
+
+	public function testAsdf(): void {
+		$this->assertQuery(
+			'CREATE TABLE t (id INT, tms timestamp, d decimal (26 , 8 ) KEY timestamp(timestamp))'
+		);
+		$res = $this->assertQuery( "SELECT * FROM _mysql_data_types_cache WHERE `table` = 't'" );
+		var_dump( $res );
+		var_dump( $this->assertQuery( 'SHOW CREATE TABLE t' ) );
+	}
 }

wp-includes/sqlite-ast/class-wp-pdo-mysql-on-sqlite.php

@@ -5986,7 +5986,7 @@ function ( $column ) {
 				}
 				$rows[] = sprintf( '  PRIMARY KEY (%s)', implode( ', ', $column_list ) );
 			} else {
-				$is_unique = '0' === $info['NON_UNIQUE'];
+				$is_unique = 0 === (int) $info['NON_UNIQUE'];
 
 				// Prefix the original index name with the table name.
 				// This is to avoid conflicting index names in SQLite.
@@ -6267,7 +6267,7 @@ function ( $column ) {
 				);
 				$sql .= ')';
 			} else {
-				$is_unique = '0' === $info['NON_UNIQUE'];
+				$is_unique = 0 === (int) $info['NON_UNIQUE'];
 
 				$sql  = sprintf(
 					'  %s%s%sKEY ',

wp-includes/sqlite-ast/class-wp-sqlite-information-schema-reconstructor.php

@@ -359,13 +359,13 @@ private function generate_column_definition( string $table_name, array $column_i
 		$definition[] = $mysql_type;
 
 		// NULL/NOT NULL.
-		if ( '1' === $column_info['notnull'] ) {
+		if ( 1 === (int) $column_info['notnull'] ) {
 			$definition[] = 'NOT NULL';
 		}
 
 		// Auto increment.
 		$is_auto_increment = false;
-		if ( '0' !== $column_info['pk'] ) {
+		if ( 0 !== (int) $column_info['pk'] ) {
 			$is_auto_increment = $this->driver->execute_sqlite_query(
 				'SELECT 1 FROM sqlite_master WHERE tbl_name = ? AND sql LIKE ?',
 				array( $table_name, '%AUTOINCREMENT%' )
@@ -403,7 +403,7 @@ private function generate_key_definition( string $table_name, array $key_info, a
 			$definition[] = 'FULLTEXT KEY';
 		} elseif ( 'SPATIAL' === $cached_type ) {
 			$definition[] = 'SPATIAL KEY';
-		} elseif ( 'UNIQUE' === $cached_type || '1' === $key_info['unique'] ) {
+		} elseif ( 'UNIQUE' === $cached_type || 1 === (int) $key_info['unique'] ) {
 			$definition[] = 'UNIQUE KEY';
 		} else {
 			$definition[] = 'KEY';

wp-includes/sqlite/class-wp-sqlite-db.php

@@ -79,10 +79,10 @@ public function set_charset( $dbh, $charset = null, $collate = null ) {
 	 *
 	 * @return string The character set.
 	 */
-	public function get_col_charset( $table, $column ) {
+	//public function get_col_charset( $table, $column ) {
 		// Hardcoded for now.
-		return 'utf8mb4';
-	}
+	//  return 'utf8mb4';
+	//}
 
 	/**
 	 * Changes the current SQL mode, and ensures its WordPress compatibility.