WIP on reorg
This commit is contained in:
@@ -4,7 +4,7 @@ import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import solutions.bitbadger.documents.common.AutoId;
|
||||
import solutions.bitbadger.documents.common.DocumentException;
|
||||
import solutions.bitbadger.documents.java.testDocs.*;
|
||||
import solutions.bitbadger.documents.java.java.testDocs.*;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ package solutions.bitbadger.documents.common
|
||||
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.api.Test
|
||||
import solutions.bitbadger.documents.integration.TEST_TABLE
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertFalse
|
||||
import kotlin.test.assertTrue
|
||||
@@ -101,7 +100,7 @@ class ComparisonInArrayTest {
|
||||
fun op() =
|
||||
assertEquals(
|
||||
Op.IN_ARRAY,
|
||||
ComparisonInArray(Pair(TEST_TABLE, listOf<String>())).op,
|
||||
ComparisonInArray(Pair("tbl", listOf<String>())).op,
|
||||
"InArray comparison should have IN_ARRAY op"
|
||||
)
|
||||
|
||||
|
||||
@@ -4,11 +4,7 @@ import org.junit.jupiter.api.AfterEach
|
||||
import org.junit.jupiter.api.DisplayName
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.junit.jupiter.api.assertThrows
|
||||
import solutions.bitbadger.documents.*
|
||||
import solutions.bitbadger.documents.common.Configuration
|
||||
import solutions.bitbadger.documents.common.Dialect
|
||||
import solutions.bitbadger.documents.common.DocumentException
|
||||
import solutions.bitbadger.documents.common.Field
|
||||
import solutions.bitbadger.documents.common.*
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
/**
|
||||
@@ -34,7 +30,7 @@ class RemoveFieldsTest {
|
||||
Configuration.dialectValue = Dialect.POSTGRESQL
|
||||
assertEquals(
|
||||
"UPDATE $tbl SET data = data - :name::text[] WHERE data->>'id' = :id",
|
||||
RemoveFields.byId<String>(tbl, Parameters.fieldNames(listOf("a", "z"))),
|
||||
RemoveFields.byId<String>(tbl, listOf(Parameter(":name", ParameterType.STRING, "{a,z}"))),
|
||||
"Remove Fields query not constructed correctly"
|
||||
)
|
||||
}
|
||||
@@ -45,7 +41,13 @@ class RemoveFieldsTest {
|
||||
Configuration.dialectValue = Dialect.SQLITE
|
||||
assertEquals(
|
||||
"UPDATE $tbl SET data = json_remove(data, :name0, :name1) WHERE data->>'id' = :id",
|
||||
RemoveFields.byId<String>(tbl, Parameters.fieldNames(listOf("a", "z"))),
|
||||
RemoveFields.byId<String>(
|
||||
tbl,
|
||||
listOf(
|
||||
Parameter(":name0", ParameterType.STRING, "a"),
|
||||
Parameter(":name1", ParameterType.STRING, "z")
|
||||
)
|
||||
),
|
||||
"Remove Field query not constructed correctly"
|
||||
)
|
||||
}
|
||||
@@ -56,7 +58,11 @@ class RemoveFieldsTest {
|
||||
Configuration.dialectValue = Dialect.POSTGRESQL
|
||||
assertEquals(
|
||||
"UPDATE $tbl SET data = data - :name::text[] WHERE data->>'f' > :g",
|
||||
RemoveFields.byFields(tbl, Parameters.fieldNames(listOf("b", "c")), listOf(Field.greater("f", "", ":g"))),
|
||||
RemoveFields.byFields(
|
||||
tbl,
|
||||
listOf(Parameter(":name", ParameterType.STRING, "{b,c}")),
|
||||
listOf(Field.greater("f", "", ":g"))
|
||||
),
|
||||
"Remove Field query not constructed correctly"
|
||||
)
|
||||
}
|
||||
@@ -67,7 +73,11 @@ class RemoveFieldsTest {
|
||||
Configuration.dialectValue = Dialect.SQLITE
|
||||
assertEquals(
|
||||
"UPDATE $tbl SET data = json_remove(data, :name0, :name1) WHERE data->>'f' > :g",
|
||||
RemoveFields.byFields(tbl, Parameters.fieldNames(listOf("b", "c")), listOf(Field.greater("f", "", ":g"))),
|
||||
RemoveFields.byFields(
|
||||
tbl,
|
||||
listOf(Parameter(":name0", ParameterType.STRING, "b"), Parameter(":name1", ParameterType.STRING, "c")),
|
||||
listOf(Field.greater("f", "", ":g"))
|
||||
),
|
||||
"Remove Field query not constructed correctly"
|
||||
)
|
||||
}
|
||||
@@ -78,7 +88,7 @@ class RemoveFieldsTest {
|
||||
Configuration.dialectValue = Dialect.POSTGRESQL
|
||||
assertEquals(
|
||||
"UPDATE $tbl SET data = data - :name::text[] WHERE data @> :criteria",
|
||||
RemoveFields.byContains(tbl, Parameters.fieldNames(listOf("m", "n"))),
|
||||
RemoveFields.byContains(tbl, listOf(Parameter(":name", ParameterType.STRING, "{m,n}"))),
|
||||
"Remove Field query not constructed correctly"
|
||||
)
|
||||
}
|
||||
@@ -96,7 +106,7 @@ class RemoveFieldsTest {
|
||||
Configuration.dialectValue = Dialect.POSTGRESQL
|
||||
assertEquals(
|
||||
"UPDATE $tbl SET data = data - :name::text[] WHERE jsonb_path_exists(data, :path::jsonpath)",
|
||||
RemoveFields.byJsonPath(tbl, Parameters.fieldNames(listOf("o", "p"))),
|
||||
RemoveFields.byJsonPath(tbl, listOf(Parameter(":name", ParameterType.STRING, "{o,p}"))),
|
||||
"Remove Field query not constructed correctly"
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user