Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infix query functions #14

Merged
merged 17 commits into from
Jan 27, 2024
Merged

Infix query functions #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a611f7a
Make Expression functions infix
jeffdgr8 Jan 17, 2024
bc7e0db
Make all query ktx functions infix
jeffdgr8 Jan 17, 2024
1887069
Split asObjectsFlow default param as own function overload
jeffdgr8 Jan 17, 2024
d8b5b5c
Add additional QueryBuilder ktx infix functions for joins
jeffdgr8 Jan 17, 2024
7c49b14
Fix query in docs
jeffdgr8 Jan 17, 2024
58daebb
Make `as` and from functions infix
jeffdgr8 Jan 17, 2024
6a766e6
Add ktx query extensions docs
jeffdgr8 Jan 17, 2024
cb44a52
Remove insignificant inlines
jeffdgr8 Jan 17, 2024
0ddb39c
Dump API
jeffdgr8 Jan 17, 2024
73a6475
Add asObjectsFlow$default functions to preserve binary compatibility
jeffdgr8 Jan 17, 2024
d18d7ea
Add copyright comments
jeffdgr8 Jan 23, 2024
4d459f0
Make OrderByBuilder constructor internal
jeffdgr8 Jan 23, 2024
6b199c3
Replace deprecated URL constructor
jeffdgr8 Jan 23, 2024
d5f1462
Format code
jeffdgr8 Jan 23, 2024
417e4ce
Dump API
jeffdgr8 Jan 24, 2024
fb5fdfe
Handle URISyntaxException in toFileUrl()
jeffdgr8 Jan 24, 2024
44198d6
Ignore deprecations in DatabaseEETest
jeffdgr8 Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions couchbase-lite-ee-ktx/api/android/couchbase-lite-ee-ktx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,32 @@ public final class kotbase/ktx/IndexBuilderExtKt {
}

public final class kotbase/ktx/OrderByBuilder {
public fun <init> ()V
public final fun ascending (Ljava/lang/String;)V
public final fun ascending (Lkotbase/Expression;)V
public final fun descending (Ljava/lang/String;)V
public final fun descending (Lkotbase/Expression;)V
public final fun orderings ()[Lkotbase/Ordering;
}

public final class kotbase/ktx/QueryBuilderExtKt {
public static final fun as (Lkotbase/Collection;Ljava/lang/String;)Lkotbase/DataSource;
public static final fun as (Lkotbase/Database;Ljava/lang/String;)Lkotbase/DataSource;
public static final fun as (Lkotbase/Expression;Ljava/lang/String;)Lkotbase/SelectResult$As;
public static final fun from (Ljava/lang/String;Ljava/lang/String;)Lkotbase/Expression;
public static final fun groupBy (Lkotbase/GroupByRouter;[Ljava/lang/String;)Lkotbase/GroupBy;
public static final fun select (Lkotbase/Expression;Ljava/lang/String;[Ljava/lang/String;)Lkotbase/Select;
public static final fun select (Lkotbase/Expression;Lkotbase/SelectResult;[Lkotbase/SelectResult;)Lkotbase/Select;
public static final fun select (Lkotbase/Expression;[Lkotbase/Expression;)Lkotbase/Select;
public static final fun selectCount (Ljava/lang/String;)Lkotbase/Select;
public static synthetic fun selectCount$default (Ljava/lang/String;ILjava/lang/Object;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;Ljava/lang/String;[Ljava/lang/String;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;Lkotbase/SelectResult;[Lkotbase/SelectResult;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;[Lkotbase/Expression;)Lkotbase/Select;
public static final fun selectDistinct ([Ljava/lang/String;)Lkotbase/Select;
public static final fun selectDistinct ([Lkotbase/SelectResult;)Lkotbase/Select;
}

public final class kotbase/ktx/QueryBuilderExtensionsKt {
public static final fun all ()Lkotbase/SelectResult$From;
public static final fun and (Lkotbase/Expression;Lkotbase/Expression;)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;D)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;F)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;I)Lkotbase/Expression;
Expand Down Expand Up @@ -176,7 +183,6 @@ public final class kotbase/ktx/QueryBuilderExtensionsKt {
public static final fun notEqualTo (Lkotbase/Expression;Ljava/util/Map;)Lkotbase/Expression;
public static final fun notEqualTo (Lkotbase/Expression;Lkotlinx/datetime/Instant;)Lkotbase/Expression;
public static final fun notEqualTo (Lkotbase/Expression;Z)Lkotbase/Expression;
public static final fun or (Lkotbase/Expression;Lkotbase/Expression;)Lkotbase/Expression;
public static final fun orderBy (Lkotbase/OrderByRouter;Lkotlin/jvm/functions/Function1;)Lkotbase/OrderBy;
public static final fun property (Ljava/lang/String;)Lkotbase/PropertyExpression;
public static final fun select ([Ljava/lang/String;)Lkotbase/Select;
Expand All @@ -186,15 +192,17 @@ public final class kotbase/ktx/QueryBuilderExtensionsKt {

public final class kotbase/ktx/QueryExtKt {
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static final synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun mapToObjects (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
}

public final class kotbase/ktx/QueryExtensionsKt {
public static final fun asFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static final synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun mapToObjects (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
}

Expand Down
20 changes: 14 additions & 6 deletions couchbase-lite-ee-ktx/api/jvm/couchbase-lite-ee-ktx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,32 @@ public final class kotbase/ktx/IndexBuilderExtKt {
}

public final class kotbase/ktx/OrderByBuilder {
public fun <init> ()V
public final fun ascending (Ljava/lang/String;)V
public final fun ascending (Lkotbase/Expression;)V
public final fun descending (Ljava/lang/String;)V
public final fun descending (Lkotbase/Expression;)V
public final fun orderings ()[Lkotbase/Ordering;
}

public final class kotbase/ktx/QueryBuilderExtKt {
public static final fun as (Lkotbase/Collection;Ljava/lang/String;)Lkotbase/DataSource;
public static final fun as (Lkotbase/Database;Ljava/lang/String;)Lkotbase/DataSource;
public static final fun as (Lkotbase/Expression;Ljava/lang/String;)Lkotbase/SelectResult$As;
public static final fun from (Ljava/lang/String;Ljava/lang/String;)Lkotbase/Expression;
public static final fun groupBy (Lkotbase/GroupByRouter;[Ljava/lang/String;)Lkotbase/GroupBy;
public static final fun select (Lkotbase/Expression;Ljava/lang/String;[Ljava/lang/String;)Lkotbase/Select;
public static final fun select (Lkotbase/Expression;Lkotbase/SelectResult;[Lkotbase/SelectResult;)Lkotbase/Select;
public static final fun select (Lkotbase/Expression;[Lkotbase/Expression;)Lkotbase/Select;
public static final fun selectCount (Ljava/lang/String;)Lkotbase/Select;
public static synthetic fun selectCount$default (Ljava/lang/String;ILjava/lang/Object;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;Ljava/lang/String;[Ljava/lang/String;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;Lkotbase/SelectResult;[Lkotbase/SelectResult;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;[Lkotbase/Expression;)Lkotbase/Select;
public static final fun selectDistinct ([Ljava/lang/String;)Lkotbase/Select;
public static final fun selectDistinct ([Lkotbase/SelectResult;)Lkotbase/Select;
}

public final class kotbase/ktx/QueryBuilderExtensionsKt {
public static final fun all ()Lkotbase/SelectResult$From;
public static final fun and (Lkotbase/Expression;Lkotbase/Expression;)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;D)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;F)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;I)Lkotbase/Expression;
Expand Down Expand Up @@ -176,7 +183,6 @@ public final class kotbase/ktx/QueryBuilderExtensionsKt {
public static final fun notEqualTo (Lkotbase/Expression;Ljava/util/Map;)Lkotbase/Expression;
public static final fun notEqualTo (Lkotbase/Expression;Lkotlinx/datetime/Instant;)Lkotbase/Expression;
public static final fun notEqualTo (Lkotbase/Expression;Z)Lkotbase/Expression;
public static final fun or (Lkotbase/Expression;Lkotbase/Expression;)Lkotbase/Expression;
public static final fun orderBy (Lkotbase/OrderByRouter;Lkotlin/jvm/functions/Function1;)Lkotbase/OrderBy;
public static final fun property (Ljava/lang/String;)Lkotbase/PropertyExpression;
public static final fun select ([Ljava/lang/String;)Lkotbase/Select;
Expand All @@ -186,15 +192,17 @@ public final class kotbase/ktx/QueryBuilderExtensionsKt {

public final class kotbase/ktx/QueryExtKt {
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static final synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun mapToObjects (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
}

public final class kotbase/ktx/QueryExtensionsKt {
public static final fun asFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static final synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun mapToObjects (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
}

Expand Down
1 change: 1 addition & 0 deletions couchbase-lite-ee/src/commonTest/ee/kotbase/DatabaseEETest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import kotlin.test.Test
import kotlin.test.assertTrue
import kotlin.time.Duration.Companion.seconds

@Suppress("DEPRECATION")
class DatabaseEETest : BaseReplicatorTest() {

// DatabaseTest.swift
Expand Down
20 changes: 14 additions & 6 deletions couchbase-lite-ktx/api/android/couchbase-lite-ktx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,32 @@ public final class kotbase/ktx/IndexBuilderExtKt {
}

public final class kotbase/ktx/OrderByBuilder {
public fun <init> ()V
public final fun ascending (Ljava/lang/String;)V
public final fun ascending (Lkotbase/Expression;)V
public final fun descending (Ljava/lang/String;)V
public final fun descending (Lkotbase/Expression;)V
public final fun orderings ()[Lkotbase/Ordering;
}

public final class kotbase/ktx/QueryBuilderExtKt {
public static final fun as (Lkotbase/Collection;Ljava/lang/String;)Lkotbase/DataSource;
public static final fun as (Lkotbase/Database;Ljava/lang/String;)Lkotbase/DataSource;
public static final fun as (Lkotbase/Expression;Ljava/lang/String;)Lkotbase/SelectResult$As;
public static final fun from (Ljava/lang/String;Ljava/lang/String;)Lkotbase/Expression;
public static final fun groupBy (Lkotbase/GroupByRouter;[Ljava/lang/String;)Lkotbase/GroupBy;
public static final fun select (Lkotbase/Expression;Ljava/lang/String;[Ljava/lang/String;)Lkotbase/Select;
public static final fun select (Lkotbase/Expression;Lkotbase/SelectResult;[Lkotbase/SelectResult;)Lkotbase/Select;
public static final fun select (Lkotbase/Expression;[Lkotbase/Expression;)Lkotbase/Select;
public static final fun selectCount (Ljava/lang/String;)Lkotbase/Select;
public static synthetic fun selectCount$default (Ljava/lang/String;ILjava/lang/Object;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;Ljava/lang/String;[Ljava/lang/String;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;Lkotbase/SelectResult;[Lkotbase/SelectResult;)Lkotbase/Select;
public static final fun selectDistinct (Lkotbase/Expression;[Lkotbase/Expression;)Lkotbase/Select;
public static final fun selectDistinct ([Ljava/lang/String;)Lkotbase/Select;
public static final fun selectDistinct ([Lkotbase/SelectResult;)Lkotbase/Select;
}

public final class kotbase/ktx/QueryBuilderExtensionsKt {
public static final fun all ()Lkotbase/SelectResult$From;
public static final fun and (Lkotbase/Expression;Lkotbase/Expression;)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;D)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;F)Lkotbase/Expression;
public static final fun equalTo (Lkotbase/Expression;I)Lkotbase/Expression;
Expand Down Expand Up @@ -176,7 +183,6 @@ public final class kotbase/ktx/QueryBuilderExtensionsKt {
public static final fun notEqualTo (Lkotbase/Expression;Ljava/util/Map;)Lkotbase/Expression;
public static final fun notEqualTo (Lkotbase/Expression;Lkotlinx/datetime/Instant;)Lkotbase/Expression;
public static final fun notEqualTo (Lkotbase/Expression;Z)Lkotbase/Expression;
public static final fun or (Lkotbase/Expression;Lkotbase/Expression;)Lkotbase/Expression;
public static final fun orderBy (Lkotbase/OrderByRouter;Lkotlin/jvm/functions/Function1;)Lkotbase/OrderBy;
public static final fun property (Ljava/lang/String;)Lkotbase/PropertyExpression;
public static final fun select ([Ljava/lang/String;)Lkotbase/Select;
Expand All @@ -186,15 +192,17 @@ public final class kotbase/ktx/QueryBuilderExtensionsKt {

public final class kotbase/ktx/QueryExtKt {
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static final synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun mapToObjects (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
}

public final class kotbase/ktx/QueryExtensionsKt {
public static final fun asFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun asObjectsFlow (Lkotbase/Query;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
public static final synthetic fun asObjectsFlow$default (Lkotbase/Query;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
public static final fun mapToObjects (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
}

Expand Down
Loading