Skip to content
Snippets Groups Projects
Commit 3b90d558 authored by npedot's avatar npedot
Browse files

adds Source to Database

parent 2f897ca7
Branches
Tags
No related merge requests found
Showing
with 19 additions and 13 deletions
......@@ -22,6 +22,9 @@ open class Database () {
@JacksonXmlProperty(localName = "query")
var mappings : MutableList<Query>? = ArrayList<Query>()
@JacksonXmlProperty(isAttribute = true)
var source: String = ""
init {
this.mappings = mutableListOf()
}
......
......@@ -44,6 +44,7 @@ class MetaSchemaReadUseCase() {
if (tokens.size==3)
table = tokens[2]
db = metaSchemaRepository.metaDatabase(datasource)
db.source = datasource.name
//print(xmlSerializer.prettyDatabase(db))
}
return UseCaseResult("${name()} done.", db)
......
......@@ -61,7 +61,7 @@ class ApplyChangeSetUseCaseTest {
val db = setUpPersonDb()
val serialized = XMLSerializerJacksonAdapter().prettyDatabase(db)
assertEquals("""
<database name="person" id="">
<database name="person" id="" source="">
<schema name="" id="">
<tables>
<tables name="person" id="" view="" condition="">
......@@ -103,7 +103,7 @@ class ApplyChangeSetUseCaseTest {
val serializeDb = serializer.serializeDatabase(db)
val serializeNewDb = serializer.prettyDatabase(newdb)
val expectedDb = """
<database name="person" id="">
<database name="person" id="" source="">
<schema name="" id="">
<tables>
<tables name="person1" id="" view="" condition="">
......
......@@ -37,7 +37,7 @@ class JacksonTest {
val result = writer.writeValueAsString(db)
// then
assertEquals("""
<database name="" id="">
<database name="" id="" source="">
<schema name="" id="">
<tables/>
<constraints/>
......@@ -52,7 +52,7 @@ class JacksonTest {
fun test_deserialize_db() {
// given
val dbxml = """
<database name="" id="">
<database name="" id="" source="">
<schema name="" id="">
<tables/>
<constraints/>
......@@ -73,7 +73,7 @@ class JacksonTest {
// then
assertEquals(0,newdb.schema.tables().size)
assertEquals("""
<database name="" id="">
<database name="" id="" source="">
<schema name="" id=""/>
</database>
""".trimIndent(),result)
......
......@@ -64,7 +64,7 @@ class XMLSerializerDatabaseTest {
val serializedDatabase = serializer.prettyDatabase(database).ok
// then
assertEquals("""
<database name="dbname" id="iddb">
<database name="dbname" id="iddb" source="">
<schema name="" id="idschema">
<tables>
<tables name="" id="" view="" condition="">
......
......@@ -28,6 +28,7 @@ class XStreamTest {
<constraints/>
</schema>
<mappings/>
<source></source>
</database>
""".trimIndent(),dbxml)
}
......@@ -35,7 +36,7 @@ class XStreamTest {
@Test
fun test_xstream_deserialize() {
val dbxml = """
<database name="">
<database name="" source="">
<id></id>
<schema>
<name></name>
......
......@@ -45,6 +45,7 @@ class YAMLSerializerDatabaseTest {
columns: []
constraints: []
mappings: []
source: ""
""".trimIndent(),outWriter.toString())
}
......
<database name="dbname" id="iddb">
<database name="dbname" id="iddb" source="">
<schema name="" id="idschema">
<tables>
<tables name="" id="" condition="" view="">
......
<database name="" id="">
<database name="" id="" source="">
<schema name="" id="">
<tables>
<tables name="person" id="" view="" condition="">
......
<database name="" id="">
<database name="" id="" source="">
<schema name="" id="">
<tables>
<tables name="person1" id="" view="person" condition="">
......
<database name="sourceName" id="5dca90a2-5dd6-4791-b4b8-b82d26f8a7f3">
<database name="sourceName" id="5dca90a2-5dd6-4791-b4b8-b82d26f8a7f3" source="">
<schema name="sourceName" id="1a2e31f0-6501-4316-8568-231ddec2c4b7">
<tables>
<tables name="actor" id="" view="" condition="">
......
<database name="sourceName" id="5dca90a2-5dd6-4791-b4b8-b82d26f8a7f3">
<database name="sourceName" id="5dca90a2-5dd6-4791-b4b8-b82d26f8a7f3" source="">
<schema name="sourceName" id="1a2e31f0-6501-4316-8568-231ddec2c4b7">
<tables>
<tables name="actor" id="" view="" condition="">
......
<?xml version="1.0" encoding="UTF-8"?>
<database name="prova" id="">
<database name="prova" id="" source="">
<schema name="" id="">
<tables>
<tables name="univ" id="">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment