Better Id validation and condition filtering

outr · Mar 28, 2024 · 3aa7a5e · 3aa7a5e
1 parent 2b19469
commit 3aa7a5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/core/shared/src/main/scala/lightdb/Id.scala b/core/shared/src/main/scala/lightdb/Id.scala
@@ -1,12 +1,11 @@
 package lightdb
 
-import fabric._
 import fabric.rw._
 
 class Id[T](val value: String) extends AnyVal {
   def bytes: Array[Byte] = {
     val b = toString.getBytes("UTF-8")
-    assert(b.length <= 128, s"Must be 128 bytes or less, but was ${b.length}")
+    assert(b.length <= 128, s"Must be 128 bytes or less, but was ${b.length} ($value)")
     b
   }
   def parts: Vector[String] = value.split('/').toVector

diff --git a/core/shared/src/main/scala/lightdb/query/package.scala b/core/shared/src/main/scala/lightdb/query/package.scala
@@ -1,8 +1,14 @@
 package lightdb
 
 import lightdb.field.Field
+import lightdb.query.Filter.GroupedFilter
+
+import scala.language.implicitConversions
 
 package object query {
+  implicit def conditionTuple2Filter[D <: Document[D]](tuple: (Filter[D], Condition)): Filter[D] =
+    GroupedFilter(0, List(tuple))
+
   implicit class FieldQueryExtras[D <: Document[D], F](val field: Field[D, F]) extends AnyVal {
     def ===(value: F): Filter[D] = Filter.Equals(field, value)
     def is(value: F): Filter[D] = Filter.Equals(field, value)