Skip to content

Commit

Permalink
Fix tests for mariadb
Browse files Browse the repository at this point in the history
  • Loading branch information
eikek committed Jun 4, 2022
1 parent cfc9034 commit ae265ed
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class AddonExecutorTest extends CatsEffectSuite with Fixtures with TestLoggingCo
val logger = docspell.logging.getLogger[IO]

override def docspellLogConfig =
super.docspellLogConfig.copy(minimumLevel = Level.Trace)
super.docspellLogConfig.copy(minimumLevel = Level.Error)

tempDir.test("select docker if Dockerfile exists") { dir =>
for {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class MigrationTest
PostgreSQLContainer.Def(DockerImageName.parse("postgres:14"))

override def docspellLogConfig: LogConfig =
super.docspellLogConfig.docspellLevel(Level.Debug)
super.docspellLogConfig.docspellLevel(Level.Error)

test("create schema") {
withContainers { cnt =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PsqlFtsClientTest
private val table = FtsRepository.table

override def docspellLogConfig: LogConfig =
super.docspellLogConfig.docspellLevel(Level.Debug)
super.docspellLogConfig.docspellLevel(Level.Error)

test("insert data into index") {
withContainers { cnt =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ import fs2.Stream
import docspell.common._
import docspell.ftsclient.FtsResult
import docspell.ftsclient.FtsResult.{AttachmentData, ItemMatch}
import docspell.logging.Level
import docspell.store._
import docspell.store.fts.RFtsResult
import docspell.store.qb.DSL._
import docspell.store.qb._
import docspell.store.queries.{QItem, Query}
Expand All @@ -28,7 +26,6 @@ import doobie._

class TempFtsOpsTest extends DatabaseTest {
private[this] val logger = docspell.logging.getLogger[IO]
override def rootMinimumLevel = Level.Info

override def munitFixtures = postgresAll ++ mariaDbAll ++ h2All

Expand Down Expand Up @@ -174,7 +171,7 @@ class TempFtsOpsTest extends DatabaseTest {
}

def makeCollective(cid: Ident): RCollective =
RCollective(cid, CollectiveState.Active, Language.English, true, Timestamp.Epoch)
RCollective(cid, CollectiveState.Active, Language.English, true, ts)

def makeItem(n: Int, cid: Ident): RItem =
RItem(
Expand All @@ -191,9 +188,11 @@ class TempFtsOpsTest extends DatabaseTest {
None,
None,
None,
Timestamp.Epoch,
Timestamp.Epoch,
ts,
ts,
None,
None
)

val ts = Timestamp.ofMillis(1654329963743L)
}
14 changes: 10 additions & 4 deletions website/site/content/docs/webapp/finding.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,17 @@ unless one of the following is true:
## The Query

The query string for full text search is very powerful. Docspell
currently supports [Apache SOLR](https://solr.apache.org/) as
full text search backend, so you may want to have a look at their
[documentation on query
currently supports [Apache SOLR](https://solr.apache.org/) and
[PostgreSQL](https://www.postgresql.org/docs/14/textsearch.html) as
full text search backends. You may want to have a look at [SOLRs
documentation on query
syntax](https://solr.apache.org/guide/8_4/query-syntax-and-parsing.html#query-syntax-and-parsing)
for a in depth guide.
for a in depth guide for how to search with SOLR. PostgreSQL also has
[documentation](https://www.postgresql.org/docs/14/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES)
about parsing queries, Docspell by default uses
`websearch_to_tsquery`.

Here is a quick overview for SOLR queries:

- Wildcards: `?` matches any single character, `*` matches zero or
more characters
Expand Down

0 comments on commit ae265ed

Please sign in to comment.