diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..ded1b59
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..ded1b59
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..bdf7c5f
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..ded1b59
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..bdf7c5f
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 461892f..3411d6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.0-rc-1025'
+ ext.kotlin_version = '1.0.4'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..ded1b59
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..bdf7c5f
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 461892f..3411d6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.0-rc-1025'
+ ext.kotlin_version = '1.0.4'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
diff --git a/src/nl/astraeus/database/Database.kt b/src/nl/astraeus/database/Database.kt
index 235dc96..0744801 100644
--- a/src/nl/astraeus/database/Database.kt
+++ b/src/nl/astraeus/database/Database.kt
@@ -63,7 +63,7 @@
try {
begin()
- var result = task()
+ val result = task()
commit()
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..ded1b59
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..bdf7c5f
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 461892f..3411d6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.0-rc-1025'
+ ext.kotlin_version = '1.0.4'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
diff --git a/src/nl/astraeus/database/Database.kt b/src/nl/astraeus/database/Database.kt
index 235dc96..0744801 100644
--- a/src/nl/astraeus/database/Database.kt
+++ b/src/nl/astraeus/database/Database.kt
@@ -63,7 +63,7 @@
try {
begin()
- var result = task()
+ val result = task()
commit()
diff --git a/src/nl/astraeus/database/Queries.kt b/src/nl/astraeus/database/Queries.kt
index 66a8258..1a5b328 100644
--- a/src/nl/astraeus/database/Queries.kt
+++ b/src/nl/astraeus/database/Queries.kt
@@ -8,7 +8,7 @@
* Time: 16:46
*/
-fun execute(query: String, vararg args: String) = Persister.execute(query, *args);
+fun execute(query: String, vararg args: String) = Persister.execute(query, *args)
fun query(query: String, vararg args: String): ResultSet = Persister.executeQuery(query, *args)
diff --git a/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
new file mode 100644
index 0000000..da14166
--- /dev/null
+++ b/.idea/libraries/Gradle__com_h2database_h2_1_4_192.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
new file mode 100644
index 0000000..a93b4c0
--- /dev/null
+++ b/.idea/libraries/Gradle__nl_astraeus_template_very_simple_templates_1_3_SNAPSHOT.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
new file mode 100644
index 0000000..859324a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_runtime_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
new file mode 100644
index 0000000..3207038
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_0_4.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
new file mode 100644
index 0000000..12bea8a
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
new file mode 100644
index 0000000..1a91ac2
--- /dev/null
+++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_21.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_main.iml b/.idea/modules/simple-database-kotlin_main.iml
new file mode 100644
index 0000000..ded1b59
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_main.iml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/simple-database-kotlin_test.iml b/.idea/modules/simple-database-kotlin_test.iml
new file mode 100644
index 0000000..bdf7c5f
--- /dev/null
+++ b/.idea/modules/simple-database-kotlin_test.iml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 461892f..3411d6f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@
}
buildscript {
- ext.kotlin_version = '1.0.0-rc-1025'
+ ext.kotlin_version = '1.0.4'
repositories {
maven {
url "http://nexus.astraeus.nl/nexus/content/groups/public"
diff --git a/src/nl/astraeus/database/Database.kt b/src/nl/astraeus/database/Database.kt
index 235dc96..0744801 100644
--- a/src/nl/astraeus/database/Database.kt
+++ b/src/nl/astraeus/database/Database.kt
@@ -63,7 +63,7 @@
try {
begin()
- var result = task()
+ val result = task()
commit()
diff --git a/src/nl/astraeus/database/Queries.kt b/src/nl/astraeus/database/Queries.kt
index 66a8258..1a5b328 100644
--- a/src/nl/astraeus/database/Queries.kt
+++ b/src/nl/astraeus/database/Queries.kt
@@ -8,7 +8,7 @@
* Time: 16:46
*/
-fun execute(query: String, vararg args: String) = Persister.execute(query, *args);
+fun execute(query: String, vararg args: String) = Persister.execute(query, *args)
fun query(query: String, vararg args: String): ResultSet = Persister.executeQuery(query, *args)
diff --git a/test/nl/astraeus/database/TestQueries.kt b/test/nl/astraeus/database/TestQueries.kt
index e16b085..9339f48 100644
--- a/test/nl/astraeus/database/TestQueries.kt
+++ b/test/nl/astraeus/database/TestQueries.kt
@@ -23,9 +23,7 @@
fun users(): List {
return transaction> {
- var dao = UserDao()
-
- dao.where("company = ?", id)
+ UserDao.where("company = ?", id)
}
}
}
@@ -48,25 +46,21 @@
protected constructor(): this(Company(""), User(Company(""), "", ""))
}
-class CompanyDao(): Dao(Company::class.java)
+object CompanyDao: Dao(Company::class.java)
-class UserDao(): Dao(User::class.java)
+object UserDao: Dao(User::class.java)
-class MTMDao(): Dao(ManyToMany::class.java) {
+object MTMDao: Dao(ManyToMany::class.java) {
fun users(comp: Company): List {
return transaction> {
- var dao = UserDao()
-
- dao.from("join manytomany where manytomany.user = usr.id and manytomany.company = ?", comp.id)
+ UserDao.from("join manytomany where manytomany.user = usr.id and manytomany.company = ?", comp.id)
}
}
fun companies(user: User): List {
return transaction> {
- var dao = CompanyDao()
-
- dao.from("join manytomany where manytomany.company = company.id and manytomany.user = ?", user.id)
+ CompanyDao.from("join manytomany where manytomany.company = company.id and manytomany.user = ?", user.id)
}
}
}
@@ -99,38 +93,35 @@
}
@Test fun testWhere() {
- var companyDao = CompanyDao()
- var userDao = UserDao()
- var mtmDao = MTMDao()
transaction {
- var company = Company("company")
+ val company = Company("company")
- var rien = User(company, "Rien", "info@somewhere.com")
- var piet = User(company, "Piet", "piet@somewhere.com")
+ val rien = User(company, "Rien", "info@somewhere.com")
+ val piet = User(company, "Piet", "piet@somewhere.com")
- userDao.insert(rien)
- userDao.upsert(piet)
+ UserDao.insert(rien)
+ UserDao.upsert(piet)
rien.name = "Rrrrien"
- userDao.update(rien)
+ UserDao.update(rien)
piet.email = "pietje@somewhere.com"
- userDao.upsert(piet)
+ UserDao.upsert(piet)
- mtmDao.insert(ManyToMany(company, rien))
- mtmDao.insert(ManyToMany(company, piet))
- mtmDao.insert(ManyToMany(Company("Other company"), rien))
+ MTMDao.insert(ManyToMany(company, rien))
+ MTMDao.insert(ManyToMany(company, piet))
+ MTMDao.insert(ManyToMany(Company("Other company"), rien))
}
transaction {
- var user = userDao.find("name = ?", "Rrrrien")
+ val user = UserDao.find("name = ?", "Rrrrien")
user.company.name = "Better Company!"
- companyDao.update(user.company)
+ CompanyDao.update(user.company)
- var companies = mtmDao.companies(user)
+ val companies = MTMDao.companies(user)
for (company in companies) {
println("Company from ${user.name} -> ${company.name}")
@@ -138,15 +129,15 @@
}
transaction {
- var found = userDao.where("name = ?", "Rrrrien")
+ val found = UserDao.where("name = ?", "Rrrrien")
assertTrue(found.size == 1)
- assertTrue(userDao.all().size == 2)
+ assertTrue(UserDao.all().size == 2)
- assertTrue(userDao.count("name = ?", "Piet") == 1)
+ assertTrue(UserDao.count("name = ?", "Piet") == 1)
- for(company in companyDao.all()) {
+ for(company in CompanyDao.all()) {
println("Company: #${company.id} - ${company.name}")
for(user in company.users()) {
@@ -154,7 +145,7 @@
}
}
- for(user in userDao.all()) {
+ for(user in UserDao.all()) {
println("Found: #${user.id} - ${user.name} - ${user.email} - ${user.company.name}")
}