Fix tests

Author: dpanta94

src/Schema/Traits/Custom_Table_Query_Methods.php

@@ -708,19 +708,28 @@ public static function get_all_by( string $column, $value, string $operator = '=
 	 *
 	 * @since 3.0.0
 	 * @since 3.1.4 Enabled unfolding the value if is an array.
+	 * @since 3.1.4 Added the $operator parameter.
 	 *
 	 * @param string $column The column to get the model by.
 	 * @param mixed  $value  The value to get the model by.
+	 * @param string $operator The operator to use.
 	 *
 	 * @return ?mixed The model, or `null` if no model is found.
 	 *
 	 * @throws InvalidArgumentException If the column does not exist.
+	 * @throws InvalidArgumentException If the operator is invalid.
 	 */
-	public static function get_first_by( string $column, $value ) {
+	public static function get_first_by( string $column, $value, string $operator = '=' ) {
 		[ $value, $placeholder ] = self::prepare_value_for_query( $column, $value );
 
+		$operator = strtoupper( $operator );
+
+		if ( ! in_array( $operator, self::operators(), true ) ) {
+			throw new InvalidArgumentException( "Invalid operator: {$operator}." );
+		}
+
 		$database   = Config::get_db();
-		$data_array = static::fetch_first_where( $database::prepare( "WHERE %i = {$placeholder}", ...array_filter( [ $column, ...self::ensure_array( $value ) ], static fn( $v ) => null !== $v ) ), ARRAY_A );
+		$data_array = static::fetch_first_where( $database::prepare( "WHERE %i {$operator} {$placeholder}", ...array_filter( [ $column, ...self::ensure_array( $value ) ], static fn( $v ) => null !== $v ) ), ARRAY_A );
 
 		if ( empty( $data_array[ static::uid_column() ] ) ) {
 			return null;

tests/wpunit/Traits/Custom_Table_Query_MethodsTest.php

@@ -12,24 +12,20 @@
 use StellarWP\Schema\Collections\Column_Collection;
 use StellarWP\Schema\Tables\Contracts\Table;
 use StellarWP\Schema\Tables\Table_Schema;
+use StellarWP\DB\DB;
 
 class Custom_Table_Query_MethodsTest extends SchemaTestCase {
 	use Table_Fixtures;
 
 	/**
 	 * @before
+	 * @after
 	 */
 	public function drop_tables() {
 		$this->get_query_test_table()->drop();
 	}
 
 	/**
-	 * Test that update_multiple handles array values correctly.
-	 *
-	 * This test covers the fix in commit d4aea4a that ensures array values
-	 * returned from prepare_value_for_query are properly unfolded when used
-	 * in database::prepare() calls.
-	 *
 	 * @test
 	 */
 	public function should_update_multiple_with_array_values() {
@@ -43,23 +39,27 @@ public function should_update_multiple_with_array_values() {
 			'status' => 1,
 		] );
 
+		$id1 = DB::last_insert_id();
+
 		$table::insert( [
 			'name' => 'Test 2',
 			'slug' => 'test-2',
 			'status' => 1,
 		] );
 
+		$id2 = DB::last_insert_id();
+
 		// Update multiple rows using array values
-		$updated = $table::update_multiple( [
+		$updated = $table::update_many( [
 			[
-				'slug' => 'test-1',
+				'id' => $id1,
 				'name' => 'Updated Test 1',
 			],
 			[
-				'slug' => 'test-2',
+				'id' => $id2,
 				'name' => 'Updated Test 2',
 			],
-		], 'slug' );
+		] );
 
 		$this->assertEquals( 2, $updated );
 
@@ -72,42 +72,52 @@ public function should_update_multiple_with_array_values() {
 	}
 
 	/**
-	 * Test that get_all_by handles array values correctly with IN operator.
-	 *
 	 * @test
 	 */
 	public function should_get_all_by_with_array_values() {
 		$table = $this->get_query_test_table();
 		Register::table( $table );
 
 		// Insert test data
-		$id1 = $table::insert( [
+		$table::insert( [
 			'name' => 'Test 1',
 			'slug' => 'test-1',
 			'status' => 1,
 		] );
 
-		$id2 = $table::insert( [
+		$id1 = DB::last_insert_id();
+
+		$table::insert( [
 			'name' => 'Test 2',
 			'slug' => 'test-2',
 			'status' => 1,
 		] );
 
-		$id3 = $table::insert( [
+		$id2 = DB::last_insert_id();
+
+		$table::insert( [
 			'name' => 'Test 3',
 			'slug' => 'test-3',
 			'status' => 0,
 		] );
 
+		$id3 = DB::last_insert_id();
+
 		// Get all by status using array (simulating IN operator scenario)
-		$results = $table::get_all_by( 'status', 1 );
+		$results = $table::get_all_by( 'status', [ 1, 0 ], 'IN' );
+
+		$this->assertCount( 3, $results );
 
-		$this->assertCount( 2, $results );
+		$this->assertEquals( 'Test 1', $results[0]['name'] );
+		$this->assertEquals( 'Test 2', $results[1]['name'] );
+		$this->assertEquals( 'Test 3', $results[2]['name'] );
+
+		$this->assertEquals( 1, $results[0]['status'] );
+		$this->assertEquals( 1, $results[1]['status'] );
+		$this->assertEquals( 0, $results[2]['status'] );
 	}
 
 	/**
-	 * Test that get_first_by handles array values correctly.
-	 *
 	 * @test
 	 */
 	public function should_get_first_by_with_array_values() {
@@ -128,15 +138,13 @@ public function should_get_first_by_with_array_values() {
 		] );
 
 		// Get first by slug
-		$result = $table::get_first_by( 'slug', 'first-match' );
+		$result = $table::get_first_by( 'slug', [ 'second-match' ], 'NOT IN' );
 
 		$this->assertNotNull( $result );
 		$this->assertEquals( 'First Match', $result['name'] );
 	}
 
 	/**
-	 * Test that update_multiple handles integer array values.
-	 *
 	 * @test
 	 */
 	public function should_update_multiple_with_integer_array_values() {
@@ -150,13 +158,15 @@ public function should_update_multiple_with_integer_array_values() {
 			'status' => 1,
 		] );
 
+		$id1 = DB::last_insert_id();
+
 		// Update using integer value
-		$updated = $table::update_multiple( [
+		$updated = $table::update_many( [
 			[
-				'slug' => 'active-item',
+				'id' => $id1,
 				'status' => 0,
 			],
-		], 'slug' );
+		] );
 
 		$this->assertEquals( 1, $updated );
 
@@ -166,23 +176,21 @@ public function should_update_multiple_with_integer_array_values() {
 	}
 
 	/**
-	 * Test that ensure_array helper works correctly with scalar values.
-	 *
-	 * This indirectly tests the ensure_array method through the public API.
-	 *
 	 * @test
 	 */
 	public function should_handle_scalar_values_in_queries() {
 		$table = $this->get_query_test_table();
 		Register::table( $table );
 
 		// Insert test data with scalar values
-		$id = $table::insert( [
+		$table::insert( [
 			'name' => 'Scalar Test',
 			'slug' => 'scalar-test',
 			'status' => 1,
 		] );
 
+		$id = DB::last_insert_id();
+
 		$this->assertIsInt( $id );
 		$this->assertGreaterThan( 0, $id );
 
@@ -210,7 +218,7 @@ public static function get_schema_history(): array {
 					$columns[] = ( new ID( 'id' ) )->set_length( 11 )->set_type( Column_Types::INT );
 					$columns[] = ( new String_Column( 'name' ) )->set_length( 255 );
 					$columns[] = ( new String_Column( 'slug' ) )->set_length( 255 )->set_is_index( true );
-					$columns[] = ( new Integer_Column( 'status' ) )->set_length( 1 )->set_default_value( 0 );
+					$columns[] = ( new Integer_Column( 'status' ) )->set_length( 1 )->set_default( 0 );
 
 					return new Table_Schema( $table_name, $columns );
 				};