From 6ca8fde7f578454103614dd8120101bf437abd9c Mon Sep 17 00:00:00 2001
From: Mihail Geshoski <mihail@moodle.com>
Date: Mon, 29 Apr 2024 11:41:22 +0800
Subject: [PATCH] MDL-48940 core: Final deprecation of
 search_generate_text_SQL()

---
 lib/deprecatedlib.php |  8 ++++++++
 lib/searchlib.php     | 17 -----------------
 lib/upgrade.txt       |  4 ++++
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 409a16a4187..5d29835affa 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3216,3 +3216,11 @@ function question_add_context_in_key() {
 function question_fix_top_names() {
     throw new coding_exception(__FUNCTION__ . '() has been removed.');
 }
+
+/**
+ * @deprecated since Moodle 2.9
+ */
+#[\core\attribute\deprecated('search_generate_SQL', since: '2.9', mdl: 'MDL-48939', final: true)]
+function search_generate_text_SQL() {
+    \core\deprecation::emit_deprecation_if_present(__FUNCTION__);
+}
diff --git a/lib/searchlib.php b/lib/searchlib.php
index c158c78ecf5..c2caf7ae79f 100644
--- a/lib/searchlib.php
+++ b/lib/searchlib.php
@@ -381,23 +381,6 @@ class search_parser {
     }
 }
 
-/**
- * Primitive function to generate a SQL string from a parse tree
- * using TEXT indexes. If searches aren't suitable to use TEXT
- * this function calls the default search_generate_SQL() one.
- *
- * @deprecated since Moodle 2.9 MDL-48939
- * @todo MDL-48940 This will be deleted in Moodle 3.2
- * @see search_generate_SQL()
- */
-function search_generate_text_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield,
-                             $userfirstnamefield, $userlastnamefield, $timefield, $instancefield) {
-    debugging('search_generate_text_SQL() is deprecated, please use search_generate_SQL() instead.', DEBUG_DEVELOPER);
-
-    return search_generate_SQL($parsetree, $datafield, $metafield, $mainidfield, $useridfield,
-                               $userfirstnamefield, $userlastnamefield, $timefield, $instancefield);
-}
-
 /**
  * Primitive function to generate a SQL string from a parse tree.
  * Parameters:
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 49ec5e12f8e..7be6031780a 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -1,6 +1,10 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 4.5 ===
+
+* The previously deprecated function `search_generate_text_SQL` has been removed and can no longer be used.
+
 === 4.4 ===
 
 * New modinfo methods related to delegated sections (sections controlled by a component):