From f673c4eb835dfae910261c0b25a581a5b02c900c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 17 Apr 2024 11:50:03 -0400
Subject: [PATCH] Remove sql language annotation (for now).

It's broken in newer versions of Android Studio. It doesn't seem to
allow partial-sql anymore, only fully-formed statements. Same with
roomsql.
---
 .../signal/core/util/SQLiteDatabaseExtensions.kt  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt b/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
index dc67a323f4..4f41107b39 100644
--- a/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
+++ b/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
@@ -6,7 +6,6 @@ import android.database.sqlite.SQLiteDatabase
 import androidx.core.content.contentValuesOf
 import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.sqlite.db.SupportSQLiteQueryBuilder
-import org.intellij.lang.annotations.Language
 
 /**
  * Begins a transaction on the `this` database, runs the provided [block] providing the `this` value as it's argument
@@ -168,7 +167,7 @@ class SelectBuilderPart2(
   private val columns: Array<String>,
   private val tableName: String
 ) {
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): SelectBuilderPart3 {
+  fun where(where: String, vararg whereArgs: Any): SelectBuilderPart3 {
     return SelectBuilderPart3(db, columns, tableName, where, SqlUtil.buildArgs(*whereArgs))
   }
 
@@ -316,12 +315,12 @@ class UpdateBuilderPart2(
   private val tableName: String,
   private val values: ContentValues
 ) {
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): UpdateBuilderPart3 {
+  fun where(where: String, vararg whereArgs: Any): UpdateBuilderPart3 {
     require(where.isNotBlank())
     return UpdateBuilderPart3(db, tableName, values, where, SqlUtil.buildArgs(*whereArgs))
   }
 
-  fun where(@Language("sql") where: String, whereArgs: Array<String>): UpdateBuilderPart3 {
+  fun where(where: String, whereArgs: Array<String>): UpdateBuilderPart3 {
     require(where.isNotBlank())
     return UpdateBuilderPart3(db, tableName, values, where, whereArgs)
   }
@@ -368,12 +367,12 @@ class DeleteBuilderPart1(
   private val db: SupportSQLiteDatabase,
   private val tableName: String
 ) {
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): DeleteBuilderPart2 {
+  fun where(where: String, vararg whereArgs: Any): DeleteBuilderPart2 {
     require(where.isNotBlank())
     return DeleteBuilderPart2(db, tableName, where, SqlUtil.buildArgs(*whereArgs))
   }
 
-  fun where(@Language("sql") where: String, whereArgs: Array<String>): DeleteBuilderPart2 {
+  fun where(where: String, whereArgs: Array<String>): DeleteBuilderPart2 {
     require(where.isNotBlank())
     return DeleteBuilderPart2(db, tableName, where, whereArgs)
   }
@@ -395,11 +394,11 @@ class ExistsBuilderPart1(
   private val tableName: String
 ) {
 
-  fun where(@Language("sql") where: String, vararg whereArgs: Any): ExistsBuilderPart2 {
+  fun where(where: String, vararg whereArgs: Any): ExistsBuilderPart2 {
     return ExistsBuilderPart2(db, tableName, where, SqlUtil.buildArgs(*whereArgs))
   }
 
-  fun where(@Language("sql") where: String, whereArgs: Array<String>): ExistsBuilderPart2 {
+  fun where(where: String, whereArgs: Array<String>): ExistsBuilderPart2 {
     return ExistsBuilderPart2(db, tableName, where, whereArgs)
   }