TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix creating DELETE sql statement with table alias

Browse Source
This commit is contained in:
eikek
2023-02-01 23:28:08 +01:00
parent e080f19466
commit b31bd01b84
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/store/src/main/scala/docspell/store/qb/impl/FromExprBuilder.scala
View File

@ -25,7 +25,7 @@ object FromExprBuilder {
def buildTable(table: TableDef): Fragment = def buildTable(table: TableDef): Fragment =
Fragment.const(table.tableName) ++ table.alias Fragment.const(table.tableName) ++ table.alias
.map(a => Fragment.const0(a)) .map(a => Fragment.const(a))
.getOrElse(Fragment.empty) .getOrElse(Fragment.empty)
def buildRelation(rel: FromExpr.Relation): Fragment = def buildRelation(rel: FromExpr.Relation): Fragment =

5
modules/store/src/test/scala/docspell/store/qb/impl/DSLTest.scala
View File

@ -17,6 +17,11 @@ class DSLTest extends FunSuite {
val course = CourseRecord.as("c") val course = CourseRecord.as("c")
val person = PersonRecord.as("p") val person = PersonRecord.as("p")
test("delete") {
val frag = DML.deleteFragment(course, course.ownerId === 15L)
assertEquals(frag.internals.sql, "DELETE FROM course c WHERE c.owner_id = ? ")
}
test("and") { test("and") {
val c = course.lessons > 4 && person.id === 3 && person.name.like("%a%") val c = course.lessons > 4 && person.id === 3 && person.name.like("%a%")
val expect = val expect =

4
modules/store/src/test/scala/docspell/store/qb/impl/SelectBuilderTest.scala
View File

@ -32,8 +32,8 @@ class SelectBuilderTest extends FunSuite with TestLoggingConfig {
val q = Select(proj, table, cond) val q = Select(proj, table, cond)
val frag = SelectBuilder(q) val frag = SelectBuilder(q)
assertEquals( assertEquals(
frag.toString, frag.internals.sql,
"""Fragment("SELECT c.id, c.name, c.owner_id, c.lecturer_id, c.lessons FROM course c INNER JOIN person o ON c.owner_id = o.id LEFT JOIN person l ON c.lecturer_id = l.id WHERE (LOWER(c.name) LIKE ? AND o.name = ? )")""" """SELECT c.id, c.name, c.owner_id, c.lecturer_id, c.lessons FROM course c INNER JOIN person o ON c.owner_id = o.id LEFT JOIN person l ON c.lecturer_id = l.id WHERE (LOWER(c.name) LIKE ? AND o.name = ? )"""
) )
} }