Skip to content

Commit 2e18c4a

Browse files
committed
Revert "add equivalent"
This reverts commit bc1a2b7.
1 parent 72b89fd commit 2e18c4a

File tree

3 files changed

+29
-31
lines changed

3 files changed

+29
-31
lines changed

Firestore/Swift/Source/ExpressionImplementation.swift

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,17 @@ extension Expression {
373373
func stringReplace(_ find: Expression, with replace: Expression) -> FunctionExpression {
374374
return FunctionExpression(functionName: "string_replace", args: [self, find, replace])
375375
}
376+
377+
// MARK: Equivalence Operations
378+
379+
/// Creates a `BooleanExpr` that returns `true` if this expression is equivalent
380+
/// to the given value.
381+
///
382+
/// - Parameter other: The value to compare against.
383+
/// - Returns: A `BooleanExpr` that can be used in `where` clauses.
384+
func equivalent(_ other: Sendable) -> BooleanExpression {
385+
return BooleanExpression(functionName: "equivalent", args: [self, Helper.sendableToExpr(other)])
386+
}
376387
}
377388

378389
public extension Expression {
@@ -1010,8 +1021,4 @@ public extension Expression {
10101021
let exprs = [self] + values.map { Helper.sendableToExpr($0) }
10111022
return FunctionExpression(functionName: "concat", args: exprs)
10121023
}
1013-
1014-
func equivalent(_ other: Sendable) -> BooleanExpression {
1015-
return BooleanExpression(functionName: "equivalent", args: [self, Helper.sendableToExpr(other)])
1016-
}
10171024
}

Firestore/Swift/Source/SwiftAPI/Pipeline/Expressions/Expression.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1604,13 +1604,4 @@ public protocol Expression: Sendable {
16041604
/// - Parameter values: The values to concatenate.
16051605
/// - Returns: A new `FunctionExpression` representing the concatenated result.
16061606
func concat(_ values: [Sendable]) -> FunctionExpression
1607-
1608-
// MARK: Equivalence Operations
1609-
1610-
/// Creates a `BooleanExpr` that returns `true` if this expression is equivalent
1611-
/// to the given value.
1612-
///
1613-
/// - Parameter other: The value to compare against.
1614-
/// - Returns: A `BooleanExpr` that can be used in `where` clauses.
1615-
func equivalent(_ other: Sendable) -> BooleanExpression
16161607
}

Firestore/Swift/Tests/Integration/PipelineTests.swift

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,24 +1700,24 @@ class PipelineIntegrationTests: FSTIntegrationTestCase {
17001700
TestHelper.compare(snapshot: snapshot, expected: expectedResults, enforceOrder: true)
17011701
}
17021702

1703-
func testEquivalentWorks() async throws {
1704-
let collRef = collectionRef(withDocuments: [
1705-
"doc1": ["value": 1, "value2": 1],
1706-
"doc2": ["value": 1, "value2": 2],
1707-
"doc3": ["value": NSNull(), "value2": NSNull()],
1708-
"doc4": ["value": NSNull(), "value2": 1],
1709-
"doc5": ["value": Double.nan, "value2": Double.nan],
1710-
"doc6": ["value": Double.nan, "value2": 1],
1711-
])
1712-
let db = collRef.firestore
1713-
1714-
let pipeline = db.pipeline()
1715-
.collection(collRef.path)
1716-
.where(Field("value").equivalent(Field("value2")))
1717-
let snapshot = try await pipeline.execute()
1718-
1719-
XCTAssertEqual(snapshot.results.count, 3)
1720-
}
1703+
// func testEquivalentWorks() async throws {
1704+
// let collRef = collectionRef(withDocuments: [
1705+
// "doc1": ["value": 1, "value2": 1],
1706+
// "doc2": ["value": 1, "value2": 2],
1707+
// "doc3": ["value": NSNull(), "value2": NSNull()],
1708+
// "doc4": ["value": NSNull(), "value2": 1],
1709+
// "doc5": ["value": Double.nan, "value2": Double.nan],
1710+
// "doc6": ["value": Double.nan, "value2": 1],
1711+
// ])
1712+
// let db = collRef.firestore
1713+
//
1714+
// let pipeline = db.pipeline()
1715+
// .collection(collRef.path)
1716+
// .where(Field("value").equivalent(Field("value2")))
1717+
// let snapshot = try await pipeline.execute()
1718+
//
1719+
// XCTAssertEqual(snapshot.results.count, 3)
1720+
// }
17211721

17221722
func testInWorks() async throws {
17231723
let collRef = collectionRef(withDocuments: bookDocs)

0 commit comments

Comments
 (0)