Merge pull request #1272 from ragb/fix/ltree-hyphen-support

Support hyphens in LTree labels and increase max label length

Author: mpilquist

modules/core/shared/src/main/scala/data/LTree.scala

@@ -39,7 +39,7 @@ object LTree {
 
       labels.foreach(l => l match {
         case ValidLabelRegex() => ()
-        case _ => fail(s"invalid ltree label '$l'. Only alphanumeric characters and '_' are allowed.")
+        case _ => fail(s"invalid ltree label '$l'. Only alphanumeric characters, '_' and '-' are allowed.")
       })
 
       if(failure != null)
@@ -49,11 +49,11 @@ object LTree {
     }
   }
 
-  final val MaxLabelLength = 255
+  final val MaxLabelLength = 1000
   final val MaxTreeLength = 65535
 
   private final val Separator = '.'
-  private final val ValidLabelRegex = s"""^[\\p{L}0-9_]{1,$MaxLabelLength}$$""".r
+  private final val ValidLabelRegex = s"""^[\\p{L}0-9_-]{1,$MaxLabelLength}$$""".r
 
   implicit val ltreeEq: Eq[LTree] = Eq.fromUniversalEquals[LTree]
 }

modules/tests/shared/src/test/scala/data/LTreeTest.scala

@@ -20,6 +20,8 @@ class LTreeTest extends ffstest.FTest {
     assert(LTree.fromString("abc1.d_f2").isRight, "regex failed")
     assert(LTree.fromString("foo.βar.baΣΩ").isRight, "regex failed")
     assert(LTree.fromString("foo.βar.❤").isLeft, "regex failed")
+    assert(LTree.fromString("abc.d-f").isRight, "hyphen in label failed")
+    assert(LTree.fromString("a-b.c-d.e-f").isRight, "hyphens in multiple labels failed")
 
     assert(LTree.fromString(List.fill(LTree.MaxTreeLength)("a").mkString(".")).isRight, "max tree len failed")
     assert(LTree.fromString(List.fill(LTree.MaxTreeLength + 1)("a").mkString(".")).isLeft, "max tree len failed")