Skip to content

fix: query() returned null instead of 0 for statements affecting 0 rows #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chloe-pomegranate wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

fix: query() returned null instead of 0 for statements affecting 0 rows #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/WP_SQLite_Driver_Metadata_Tests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ public function testTruncateTable() {
'TRUNCATE TABLE wp_comments;'
);
$actual = $this->engine->get_query_results();
$this->assertNull( $actual );
$this->assertSame( 0, $actual );
$this->assertTableEmpty( 'wp_comments', true );
}

Expand Down
73 changes: 49 additions & 24 deletions tests/WP_SQLite_Driver_Tests.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ public function testCreateTable() {
KEY user_email (user_email)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci"
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE wptests_users;' );
$results = $this->engine->get_query_results();
Expand Down Expand Up @@ -1018,7 +1018,7 @@ public function testCreateTableWithTrailingComma() {
PRIMARY KEY (ID)
) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );
}

public function testCreateTableSpatialIndex() {
Expand All @@ -1028,7 +1028,7 @@ public function testCreateTableSpatialIndex() {
UNIQUE KEY (ID)
)'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );
}

public function testCreateTableWithMultiValueColumnTypeModifiers() {
Expand All @@ -1041,7 +1041,7 @@ enum_column ENUM('a', 'b', 'c') NOT NULL DEFAULT 'a',
PRIMARY KEY (ID)
)"
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE wptests_users;' );
$results = $this->engine->get_query_results();
Expand Down Expand Up @@ -1090,10 +1090,10 @@ public function testAlterTableAddAndDropColumn() {
name varchar(20) NOT NULL default ''
);"
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$result = $this->assertQuery( 'ALTER TABLE _tmp_table ADD COLUMN `column` int;' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE _tmp_table;' );
$results = $this->engine->get_query_results();
Expand All @@ -1120,7 +1120,7 @@ public function testAlterTableAddAndDropColumn() {
);

$result = $this->assertQuery( 'ALTER TABLE _tmp_table ADD `column2` int;' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE _tmp_table;' );
$results = $this->engine->get_query_results();
Expand Down Expand Up @@ -1155,7 +1155,7 @@ public function testAlterTableAddAndDropColumn() {
);

$result = $this->assertQuery( 'ALTER TABLE _tmp_table DROP COLUMN `column`;' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE _tmp_table;' );
$results = $this->engine->get_query_results();
Expand All @@ -1182,7 +1182,7 @@ public function testAlterTableAddAndDropColumn() {
);

$result = $this->assertQuery( 'ALTER TABLE _tmp_table DROP `column2`;' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE _tmp_table;' );
$results = $this->engine->get_query_results();
Expand All @@ -1209,7 +1209,7 @@ public function testAlterTableAddNotNullVarcharColumn() {
);

$result = $this->assertQuery( "ALTER TABLE _tmp_table ADD COLUMN `column` VARCHAR(20) NOT NULL DEFAULT 'foo';" );
$this->assertNull( $result );
$this->assertSame( 0, $result );

$this->assertQuery( 'DESCRIBE _tmp_table;' );
$results = $this->engine->get_query_results();
Expand Down Expand Up @@ -1809,7 +1809,7 @@ public function testAlterTableAddIndex() {
);

$result = $this->assertQuery( 'ALTER TABLE _tmp_table ADD INDEX name (name);' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Verify that the index was created in the information schema.
$this->assertQuery( 'SHOW INDEX FROM _tmp_table;' );
Expand Down Expand Up @@ -1862,7 +1862,7 @@ public function testAlterTableAddUniqueIndex() {
);

$result = $this->assertQuery( 'ALTER TABLE _tmp_table ADD UNIQUE INDEX name (name(20));' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Verify that the index was created in the information schema.
$this->assertQuery( 'SHOW INDEX FROM _tmp_table;' );
Expand Down Expand Up @@ -1915,7 +1915,7 @@ public function testAlterTableAddFulltextIndex() {
);

$result = $this->assertQuery( 'ALTER TABLE _tmp_table ADD FULLTEXT INDEX name (name);' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Verify that the index was created in the information schema.
$this->assertQuery( 'SHOW INDEX FROM _tmp_table;' );
Expand Down Expand Up @@ -2038,7 +2038,7 @@ public function testAlterTableModifyColumn() {

// Rename the "name" field to "firstname":
$result = $this->engine->query( "ALTER TABLE _tmp_table CHANGE column name firstname varchar(50) NOT NULL default 'mark';" );
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Confirm the original data is still there:
$result = $this->engine->query( 'SELECT * FROM _tmp_table;' );
Expand Down Expand Up @@ -2108,7 +2108,7 @@ public function testAlterTableModifyColumnWithSkippedColumnKeyword() {

// Rename the "name" field to "firstname":
$result = $this->engine->query( "ALTER TABLE _tmp_table CHANGE name firstname varchar(50) NOT NULL default 'mark';" );
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Confirm the original data is still there:
$result = $this->engine->query( 'SELECT * FROM _tmp_table;' );
Expand Down Expand Up @@ -2149,12 +2149,12 @@ public function testAlterTableModifyColumnWithHyphens() {
`foo-bar` varchar(255) DEFAULT NULL
)'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$result = $this->assertQuery(
'ALTER TABLE wptests_dbdelta_test2 CHANGE COLUMN `foo-bar` `foo-bar` text DEFAULT NULL'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$result = $this->assertQuery( 'DESCRIBE wptests_dbdelta_test2;' );
$this->assertNotFalse( $result );
Expand Down Expand Up @@ -2183,19 +2183,19 @@ public function testAlterTableModifyColumnComplexChange() {
PRIMARY KEY (ID, name)
);"
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Add a unique index
$result = $this->assertQuery(
'ALTER TABLE _tmp_table ADD UNIQUE INDEX "test_unique_composite" (name, lastname);'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Add a regular index
$result = $this->assertQuery(
'ALTER TABLE _tmp_table ADD INDEX "test_regular" (lastname);'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Confirm the table is well-behaved so far:

Expand Down Expand Up @@ -2236,10 +2236,10 @@ public function testAlterTableModifyColumnComplexChange() {

// Now – let's change a few columns:
$result = $this->engine->query( 'ALTER TABLE _tmp_table CHANGE COLUMN name firstname varchar(20)' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

$result = $this->engine->query( 'ALTER TABLE _tmp_table CHANGE COLUMN date_as_string datetime datetime NOT NULL' );
$this->assertNull( $result );
$this->assertSame( 0, $result );

// Finally, let's confirm our data is intact and the table is still well-behaved:
$result = $this->engine->query( 'SELECT * FROM _tmp_table ORDER BY ID;' );
Expand Down Expand Up @@ -2283,7 +2283,7 @@ public function testCaseInsensitiveUniqueIndex() {
UNIQUE KEY last (lastname)
);"
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$result1 = $this->engine->query( "INSERT INTO _tmp_table (name, lastname) VALUES ('first', 'last');" );
$this->assertEquals( 1, $result1 );
Expand Down Expand Up @@ -3342,6 +3342,31 @@ public function testTranslatesComplexDelete() {
);
}

public function testDeleteReturnsZeroAffectedRowsWhenNoMatchingRows() {
$this->assertQuery( 'CREATE TABLE t (id INT)' );
$this->assertQuery( 'INSERT INTO t (id) VALUES (1)' );

$result = $this->assertQuery( 'DELETE FROM t WHERE id = 1' );
$this->assertSame( 1, $result );
$this->assertSame( 1, $this->engine->get_last_return_value() );

$result = $this->assertQuery( 'DELETE FROM t WHERE id = 1' );
$this->assertSame( 0, $result );
$this->assertSame( 0, $this->engine->get_last_return_value() );
}

public function testUpdateReturnsZeroAffectedRowsWhenNoMatchingRows() {
$this->assertQuery( 'CREATE TABLE t (id INT, val TEXT)' );
$this->assertQuery( "INSERT INTO t (id, val) VALUES (1, 'a')" );

$result = $this->assertQuery( "UPDATE t SET val = 'b' WHERE id = 1" );
$this->assertSame( 1, $result );

$result = $this->assertQuery( "UPDATE t SET val = 'c' WHERE id = 999" );
$this->assertSame( 0, $result );
$this->assertSame( 0, $this->engine->get_last_return_value() );
}

public function testTranslatesDoubleAlterTable() {
$result = $this->assertQuery(
'ALTER TABLE _options
Expand All @@ -3350,7 +3375,7 @@ public function testTranslatesDoubleAlterTable() {
ADD INDEX test_index2(option_name(140),option_value(51))
'
);
$this->assertNull( $result );
$this->assertSame( 0, $result );

$result = $this->assertQuery(
'SHOW INDEX FROM _options'
Expand Down
4 changes: 1 addition & 3 deletions wp-includes/sqlite-ast/class-wp-sqlite-driver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,8 @@ public function query( string $query, $fetch_mode = PDO::FETCH_OBJ, ...$fetch_mo

if ( $stmt->columnCount() > 0 ) {
$this->last_result = $stmt->fetchAll( $fetch_mode );
} elseif ( $stmt->rowCount() > 0 ) {
$this->last_result = $stmt->rowCount();
} else {
$this->last_result = null;
$this->last_result = $stmt->rowCount();
}
return $this->last_result;
}
Expand Down