Skip to content

Commit 7d8683c

Browse files
martin-georgievmartin-georgiev
committed
no message
1 parent 5c32f66 commit 7d8683c

35 files changed

+180
-180
lines changed

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/DeleteAtPathTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function can_delete_array_element(): void
5858
#[Test]
5959
public function can_delete_with_column_reference(): void
6060
{
61-
$dql = 'SELECT DELETE_AT_PATH(t.object1, :path) as result
62-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
61+
$dql = 'SELECT DELETE_AT_PATH(t.jsonbObject1, :path) as result
62+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
6363
WHERE t.id = 1';
6464
$result = $this->executeDqlQuery($dql, ['path' => '{nested,value}']);
6565
$this->assertIsString($result[0]['result']);

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetFieldAsIntegerTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ protected function getStringFunctions(): array
2121
#[Test]
2222
public function json_get_field_as_integer(): void
2323
{
24-
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.object1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
24+
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.jsonObject1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
2525
$result = $this->executeDqlQuery($dql);
2626
$this->assertSame(30, $result[0]['result']);
2727
}
@@ -31,34 +31,34 @@ public function json_get_field_as_integer_with_index(): void
3131
{
3232
// First, let's insert test data with numeric arrays
3333
$this->connection->executeStatement(
34-
\sprintf("UPDATE %s.containsjsons SET object1 = '{\"scores\": [85, 92, 78]}' WHERE id = 1", self::DATABASE_SCHEMA)
34+
\sprintf("UPDATE %s.containsjsons SET jsonObject1 = '{\"scores\": [85, 92, 78]}' WHERE id = 1", self::DATABASE_SCHEMA)
3535
);
3636

37-
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(JSON_GET_FIELD(t.object1, 'scores'), 1) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
37+
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(JSON_GET_FIELD(t.jsonObject1, 'scores'), 1) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
3838
$result = $this->executeDqlQuery($dql);
3939
$this->assertSame(92, $result[0]['result']);
4040
}
4141

4242
#[Test]
4343
public function json_get_field_as_integer_empty_object(): void
4444
{
45-
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.object1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 4";
45+
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.jsonObject1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 4";
4646
$result = $this->executeDqlQuery($dql);
4747
$this->assertNull($result[0]['result']);
4848
}
4949

5050
#[Test]
5151
public function json_get_field_as_integer_null_value(): void
5252
{
53-
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.object1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 5";
53+
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.jsonObject1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 5";
5454
$result = $this->executeDqlQuery($dql);
5555
$this->assertNull($result[0]['result']);
5656
}
5757

5858
#[Test]
5959
public function json_get_field_as_integer_nonexistent_property_name(): void
6060
{
61-
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.object1, 'nonexistent') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
61+
$dql = "SELECT JSON_GET_FIELD_AS_INTEGER(t.jsonObject1, 'nonexistent') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
6262
$result = $this->executeDqlQuery($dql);
6363
$this->assertNull($result[0]['result']);
6464
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetFieldAsTextTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,39 @@ protected function getStringFunctions(): array
2121
#[Test]
2222
public function json_get_field_as_text_with_property_name(): void
2323
{
24-
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(t.object1, 'name') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
24+
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(t.jsonObject1, 'name') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
2525
$result = $this->executeDqlQuery($dql);
2626
$this->assertSame('John', $result[0]['result']);
2727
}
2828

2929
#[Test]
3030
public function json_get_field_as_text_with_index(): void
3131
{
32-
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(JSON_GET_FIELD(t.object1, 'tags'), 0) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
32+
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(JSON_GET_FIELD(t.jsonObject1, 'tags'), 0) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
3333
$result = $this->executeDqlQuery($dql);
3434
$this->assertSame('developer', $result[0]['result']);
3535
}
3636

3737
#[Test]
3838
public function json_get_field_as_text_nested_access(): void
3939
{
40-
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(JSON_GET_FIELD(t.object1, 'address'), 'city') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
40+
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(JSON_GET_FIELD(t.jsonObject1, 'address'), 'city') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
4141
$result = $this->executeDqlQuery($dql);
4242
$this->assertSame('New York', $result[0]['result']);
4343
}
4444

4545
#[Test]
4646
public function json_get_field_as_text_with_null_value(): void
4747
{
48-
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(t.object1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 5";
48+
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(t.jsonObject1, 'age') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 5";
4949
$result = $this->executeDqlQuery($dql);
5050
$this->assertNull($result[0]['result']);
5151
}
5252

5353
#[Test]
5454
public function json_get_field_as_text_with_nonexistent_index(): void
5555
{
56-
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(JSON_GET_FIELD(t.object1, 'tags'), 10) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
56+
$dql = "SELECT JSON_GET_FIELD_AS_TEXT(JSON_GET_FIELD(t.jsonObject1, 'tags'), 10) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
5757
$result = $this->executeDqlQuery($dql);
5858
$this->assertNull($result[0]['result']);
5959
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonGetFieldTest.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,49 @@ protected function getStringFunctions(): array
1717
}
1818

1919
#[Test]
20-
public function json_get_field_with_property_name(): void
20+
public function returns_json_string_when_getting_field_by_property_name(): void
2121
{
22-
$dql = "SELECT JSON_GET_FIELD(t.object1, 'name') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
22+
$dql = "SELECT JSON_GET_FIELD(t.jsonObject1, 'name') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
2323
$result = $this->executeDqlQuery($dql);
2424
$this->assertSame('"John"', $result[0]['result']);
2525
}
2626

2727
#[Test]
28-
public function json_get_field_with_index(): void
28+
public function returns_json_string_when_getting_field_by_index(): void
2929
{
30-
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.object1, 'tags'), 0) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
30+
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.jsonObject1, 'tags'), 0) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
3131
$result = $this->executeDqlQuery($dql);
3232
$this->assertSame('"developer"', $result[0]['result']);
3333
}
3434

3535
#[Test]
36-
public function json_get_field_nested_object_access(): void
36+
public function returns_json_string_when_accessing_nested_object(): void
3737
{
38-
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.object1, 'address'), 'city') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
38+
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.jsonObject1, 'address'), 'city') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
3939
$result = $this->executeDqlQuery($dql);
4040
$this->assertSame('"New York"', $result[0]['result']);
4141
}
4242

4343
#[Test]
44-
public function json_get_field_with_empty_array(): void
44+
public function returns_null_for_empty_array(): void
4545
{
46-
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.object1, 'tags'), 0) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 3";
46+
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.jsonObject1, 'tags'), 0) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 3";
4747
$result = $this->executeDqlQuery($dql);
4848
$this->assertNull($result[0]['result']);
4949
}
5050

5151
#[Test]
52-
public function json_get_field_with_nonexistent_index(): void
52+
public function returns_null_for_nonexistent_index(): void
5353
{
54-
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.object1, 'tags'), 10) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
54+
$dql = "SELECT JSON_GET_FIELD(JSON_GET_FIELD(t.jsonObject1, 'tags'), 10) as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
5555
$result = $this->executeDqlQuery($dql);
5656
$this->assertNull($result[0]['result']);
5757
}
5858

5959
#[Test]
60-
public function json_get_field_with_nonexistent_property_name(): void
60+
public function returns_null_for_nonexistent_property(): void
6161
{
62-
$dql = "SELECT JSON_GET_FIELD(t.object1, 'nonexistent') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
62+
$dql = "SELECT JSON_GET_FIELD(t.jsonObject1, 'nonexistent') as result FROM Fixtures\\MartinGeorgiev\\Doctrine\\Entity\\ContainsJsons t WHERE t.id = 1";
6363
$result = $this->executeDqlQuery($dql);
6464
$this->assertNull($result[0]['result']);
6565
}

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbExistsTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function getStringFunctions(): array
1919
#[Test]
2020
public function returns_true_when_key_exists(): void
2121
{
22-
$dql = 'SELECT JSONB_EXISTS(t.object1, :key) as result
22+
$dql = 'SELECT JSONB_EXISTS(t.jsonbObject1, :key) as result
2323
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
2424
WHERE t.id = 1';
2525

@@ -30,7 +30,7 @@ public function returns_true_when_key_exists(): void
3030
#[Test]
3131
public function returns_true_when_nested_key_exists(): void
3232
{
33-
$dql = 'SELECT JSONB_EXISTS(t.object1, :key) as result
33+
$dql = 'SELECT JSONB_EXISTS(t.jsonbObject1, :key) as result
3434
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
3535
WHERE t.id = 1';
3636

@@ -41,7 +41,7 @@ public function returns_true_when_nested_key_exists(): void
4141
#[Test]
4242
public function returns_true_when_array_element_exists(): void
4343
{
44-
$dql = 'SELECT JSONB_EXISTS(t.object1, :key) as result
44+
$dql = 'SELECT JSONB_EXISTS(t.jsonbObject1, :key) as result
4545
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
4646
WHERE t.id = 1';
4747

@@ -52,7 +52,7 @@ public function returns_true_when_array_element_exists(): void
5252
#[Test]
5353
public function returns_false_for_non_existing_key(): void
5454
{
55-
$dql = 'SELECT JSONB_EXISTS(t.object1, :key) as result
55+
$dql = 'SELECT JSONB_EXISTS(t.jsonbObject1, :key) as result
5656
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
5757
WHERE t.id = 1';
5858

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbInsertTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ protected function getStringFunctions(): array
2020
#[Test]
2121
public function can_insert_new_value(): void
2222
{
23-
$dql = 'SELECT JSONB_INSERT(t.object1, :path, :value) as result
23+
$dql = 'SELECT JSONB_INSERT(t.jsonbObject1, :path, :value) as result
2424
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
2525
WHERE t.id = 1';
2626
$result = $this->executeDqlQuery($dql, [
@@ -37,7 +37,7 @@ public function can_insert_new_value(): void
3737
#[Test]
3838
public function can_insert_at_nested_path(): void
3939
{
40-
$dql = 'SELECT JSONB_INSERT(t.object1, :path, :value) as result
40+
$dql = 'SELECT JSONB_INSERT(t.jsonbObject1, :path, :value) as result
4141
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
4242
WHERE t.id = 1';
4343
$result = $this->executeDqlQuery($dql, [
@@ -57,7 +57,7 @@ public function can_insert_at_nested_path(): void
5757
public function throws_exception_when_inserting_at_existing_object_key(): void
5858
{
5959
$this->expectException(Exception::class);
60-
$dql = 'SELECT JSONB_INSERT(t.object1, :path, :value) as result
60+
$dql = 'SELECT JSONB_INSERT(t.jsonbObject1, :path, :value) as result
6161
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
6262
WHERE t.id = 1';
6363
$this->executeDqlQuery($dql, [
@@ -71,7 +71,7 @@ public function throws_exception_when_inserting_at_existing_nested_path(): void
7171
{
7272
$this->expectException(Exception::class);
7373

74-
$dql = 'SELECT JSONB_INSERT(t.object1, :path, :value) as result
74+
$dql = 'SELECT JSONB_INSERT(t.jsonbObject1, :path, :value) as result
7575
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
7676
WHERE t.id = 5';
7777

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbPathExistsTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function returns_false_for_missing_path(): void
5858
#[Test]
5959
public function can_check_path_exists_in_column_reference(): void
6060
{
61-
$dql = 'SELECT JSONB_PATH_EXISTS(t.object1, :path) as result
62-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
61+
$dql = 'SELECT JSONB_PATH_EXISTS(t.jsonbObject1, :path) as result
62+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
6363
WHERE t.id = 1';
6464
$result = $this->executeDqlQuery($dql, ['path' => '$.name']);
6565
$this->assertTrue($result[0]['result']);

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbPathMatchTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public function returns_false_for_non_matching_path(): void
5858
#[Test]
5959
public function can_match_with_column_reference(): void
6060
{
61-
$dql = 'SELECT JSONB_PATH_MATCH(t.object1, :path) as result
62-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
61+
$dql = 'SELECT JSONB_PATH_MATCH(t.jsonbObject1, :path) as result
62+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
6363
WHERE t.id = 1';
6464
$result = $this->executeDqlQuery($dql, ['path' => 'exists($.name)']);
6565
$this->assertTrue($result[0]['result']);

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbPathQueryArrayTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public function jsonb_path_query_array_with_filter(): void
7171
#[Test]
7272
public function jsonb_path_query_array_with_column_reference(): void
7373
{
74-
$dql = 'SELECT JSONB_PATH_QUERY_ARRAY(t.object1, :path) as result
75-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
74+
$dql = 'SELECT JSONB_PATH_QUERY_ARRAY(t.jsonbObject1, :path) as result
75+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
7676
WHERE t.id = 1';
7777
$result = $this->executeDqlQuery($dql, ['path' => '$.tags[*]']);
7878
$this->assertIsString($result[0]['result']);

‎tests/Integration/MartinGeorgiev/Doctrine/ORM/Query/AST/Functions/JsonbPathQueryFirstTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ public function jsonb_path_query_first_with_no_match(): void
7171
#[Test]
7272
public function jsonb_path_query_first_with_column_reference(): void
7373
{
74-
$dql = 'SELECT JSONB_PATH_QUERY_FIRST(t.object1, :path) as result
75-
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
74+
$dql = 'SELECT JSONB_PATH_QUERY_FIRST(t.jsonbObject1, :path) as result
75+
FROM Fixtures\MartinGeorgiev\Doctrine\Entity\ContainsJsons t
7676
WHERE t.id = 1';
7777
$result = $this->executeDqlQuery($dql, ['path' => '$.tags[*]']);
7878
$this->assertSame('"developer"', $result[0]['result']);

0 commit comments

Comments
 (0)