See #2848161: [meta] Replace calls to deprecated db_*() wrappers

CommentFileSizeAuthor
#13 2993577-13.patch4.5 KBmondrake
#11 2993577-11.patch4.48 KBmondrake
#11 interdiff_7-11.txt1.86 KBmondrake
#8 2993577-7.patch4.17 KBandypost
#7 2993577-7.patch4.16 KBvoleger
#4 2993577-4.patch42.55 KBvoleger
#2 2993577-2.patch4.1 KBmondrake
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

mondrake created an issue. See original summary.

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Status: Active » Needs review
FileSize
2993577-2.patch4.1 KB

This should be simple now, as there is no usage of any of these functions in code at all.

So the patch here is just adding the deprecation message and the tests.

Status: Needs review » Needs work

The last submitted patch, 2: 2993577-2.patch, failed testing. View results

voleger’s picture

voleger
he/his
Primary language Ukrainian
Location Ukraine, Rivne
CreditAttribution: voleger as a volunteer and at Drupal Ukraine Community for Drupal Ukraine Community, Lemberg Solutions commented
FileSize
2993577-4.patch42.55 KB
voleger’s picture

voleger
he/his
Primary language Ukrainian
Location Ukraine, Rivne
CreditAttribution: voleger as a volunteer and at Drupal Ukraine Community for Drupal Ukraine Community, Lemberg Solutions commented
Status: Needs work » Needs review
mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Status: Needs review » Needs work 
+++ b/core/includes/database.inc
@@ -783,6 +785,7 @@ function db_add_field($table, $field, $spec, $keys_new = []) {
diff --git a/core/includes/database.inc.orig b/core/includes/database.inc.orig

diff --git a/core/includes/database.inc.orig b/core/includes/database.inc.orig
new file mode 100644

new file mode 100644
index 0000000000..ca3ca6eea6

index 0000000000..ca3ca6eea6
--- /dev/null

--- /dev/null
+++ b/core/includes/database.inc.orig

+++ b/core/includes/database.inc.orig
+++ b/core/includes/database.inc.orig
@@ -0,0 +1,1059 @@

@@ -0,0 +1,1059 @@
+<?php
+
+/**
+ * @file
+ * Core systems for the database layer.
+ *
+ * Classes required for basic functioning of the database system should be

This hunk is leftover from applying the patch locally, should be removed

voleger’s picture

voleger
he/his
Primary language Ukrainian
Location Ukraine, Rivne
CreditAttribution: voleger as a volunteer and at Drupal Ukraine Community for Drupal Ukraine Community, Lemberg Solutions commented
Status: Needs work » Needs review
FileSize
2993577-7.patch4.16 KB
andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
Status: Needs review » Reviewed & tested by the community
FileSize
2993577-7.patch4.17 KB

looks great! just reroll

patching file core/includes/database.inc
Hunk #1 succeeded at 606 (offset 3 lines).
Hunk #2 succeeded at 764 (offset 3 lines).
Hunk #3 succeeded at 788 (offset 3 lines).
patching file core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
Hunk #1 succeeded at 65 with fuzz 1 (offset 11 lines).
mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Assigned: Unassigned » mondrake
Status: Reviewed & tested by the community » Needs work

Let's also add some assertions for testDbAddField, just to test the field is actually added. On it.

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented

hm, then all 3 tests needs check that functions still works but throws exception

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Assigned: mondrake » Unassigned
Status: Needs work » Needs review
FileSize
interdiff_7-11.txt1.86 KB
2993577-11.patch4.48 KB

Here we go. db_field_names only processes array keys so I do not think anything more is needed there.

Status: Needs review » Needs work

The last submitted patch, 11: 2993577-11.patch, failed testing. View results

mondrake’s picture

mondrake
Location 🇮🇹
CreditAttribution: mondrake as a volunteer commented
Status: Needs work » Needs review
FileSize
2993577-13.patch4.5 KB

Reroll

andypost’s picture

andypost
he/him
Primary language Russian
CreditAttribution: andypost as a volunteer and at Skilld commented
Status: Needs review » Reviewed & tested by the community

Awesome!

  • catch committed 53c4c3c on 8.7.x 
    Issue #2993577 by mondrake, voleger, andypost: Properly deprecate...
catch’s picture

catch
he/him
Primary language English
CreditAttribution: catch at Third and Grove commented
Status: Reviewed & tested by the community » Fixed

Committed 53c4c3c and pushed to 8.7.x. Thanks!

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.