diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/simple-database.iml b/simple-database.iml deleted file mode 100644 index 5655608..0000000 --- a/simple-database.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/simple-database.iml b/simple-database.iml deleted file mode 100644 index 5655608..0000000 --- a/simple-database.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index 700c3e4..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -78,6 +78,8 @@ sqlTypeMapping.put(int.class, Types.INTEGER); sqlTypeMapping.put(Short.class, Types.SMALLINT); sqlTypeMapping.put(short.class, Types.SMALLINT); + sqlTypeMapping.put(Float.class, Types.DECIMAL); + sqlTypeMapping.put(float.class, Types.DECIMAL); sqlTypeMapping.put(Double.class, Types.DECIMAL); sqlTypeMapping.put(double.class, Types.DECIMAL); sqlTypeMapping.put(Boolean.class, Types.BOOLEAN); @@ -270,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -356,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/simple-database.iml b/simple-database.iml deleted file mode 100644 index 5655608..0000000 --- a/simple-database.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index 700c3e4..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -78,6 +78,8 @@ sqlTypeMapping.put(int.class, Types.INTEGER); sqlTypeMapping.put(Short.class, Types.SMALLINT); sqlTypeMapping.put(short.class, Types.SMALLINT); + sqlTypeMapping.put(Float.class, Types.DECIMAL); + sqlTypeMapping.put(float.class, Types.DECIMAL); sqlTypeMapping.put(Double.class, Types.DECIMAL); sqlTypeMapping.put(double.class, Types.DECIMAL); sqlTypeMapping.put(Boolean.class, Types.BOOLEAN); @@ -270,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -356,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/simple-database.iml b/simple-database.iml deleted file mode 100644 index 5655608..0000000 --- a/simple-database.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index 700c3e4..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -78,6 +78,8 @@ sqlTypeMapping.put(int.class, Types.INTEGER); sqlTypeMapping.put(Short.class, Types.SMALLINT); sqlTypeMapping.put(short.class, Types.SMALLINT); + sqlTypeMapping.put(Float.class, Types.DECIMAL); + sqlTypeMapping.put(float.class, Types.DECIMAL); sqlTypeMapping.put(Double.class, Types.DECIMAL); sqlTypeMapping.put(double.class, Types.DECIMAL); sqlTypeMapping.put(Boolean.class, Types.BOOLEAN); @@ -270,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -356,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/src/nl/astraeus/database/sql/mysql/types.sql b/src/nl/astraeus/database/sql/mysql/types.sql index 8e2824f..f917671 100644 --- a/src/nl/astraeus/database/sql/mysql/types.sql +++ b/src/nl/astraeus/database/sql/mysql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/simple-database.iml b/simple-database.iml deleted file mode 100644 index 5655608..0000000 --- a/simple-database.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index 700c3e4..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -78,6 +78,8 @@ sqlTypeMapping.put(int.class, Types.INTEGER); sqlTypeMapping.put(Short.class, Types.SMALLINT); sqlTypeMapping.put(short.class, Types.SMALLINT); + sqlTypeMapping.put(Float.class, Types.DECIMAL); + sqlTypeMapping.put(float.class, Types.DECIMAL); sqlTypeMapping.put(Double.class, Types.DECIMAL); sqlTypeMapping.put(double.class, Types.DECIMAL); sqlTypeMapping.put(Boolean.class, Types.BOOLEAN); @@ -270,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -356,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/src/nl/astraeus/database/sql/mysql/types.sql b/src/nl/astraeus/database/sql/mysql/types.sql index 8e2824f..f917671 100644 --- a/src/nl/astraeus/database/sql/mysql/types.sql +++ b/src/nl/astraeus/database/sql/mysql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB diff --git a/src/nl/astraeus/database/sql/postgresql/types.sql b/src/nl/astraeus/database/sql/postgresql/types.sql index f0965ab..bbb1ec0 100644 --- a/src/nl/astraeus/database/sql/postgresql/types.sql +++ b/src/nl/astraeus/database/sql/postgresql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BYTEA diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 96cc43e..aeca2ed 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -18,5 +18,9 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml deleted file mode 100644 index b2449d1..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml new file mode 100644 index 0000000..b55c3b5 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml deleted file mode 100644 index ea11182..0000000 --- a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_12.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml new file mode 100644 index 0000000..d179f62 --- /dev/null +++ b/.idea/libraries/Gradle__org_slf4j_slf4j_simple_1_7_13.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3a99fa2..d9454bb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,19 +1,11 @@ + - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 6f9bb72..53ddb09 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,9 @@ - + + + \ No newline at end of file diff --git a/.idea/modules/simple-database.iml b/.idea/modules/simple-database.iml new file mode 100644 index 0000000..b214a6e --- /dev/null +++ b/.idea/modules/simple-database.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_main.iml b/.idea/modules/simple_database_main.iml new file mode 100644 index 0000000..aa4c3ee --- /dev/null +++ b/.idea/modules/simple_database_main.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/simple_database_test.iml b/.idea/modules/simple_database_test.iml new file mode 100644 index 0000000..7e69a59 --- /dev/null +++ b/.idea/modules/simple_database_test.iml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/SimpleDatabase.iml b/SimpleDatabase.iml index cdaf7bd..a68b59d 100644 --- a/SimpleDatabase.iml +++ b/SimpleDatabase.iml @@ -28,6 +28,5 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 58d9b43..e82e066 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ group 'nl.astraeus.database' -version '1.1-SNAPSHOT' +version '1.2.3-SNAPSHOT' apply plugin: 'java' apply plugin: 'idea' diff --git a/simple-database.iml b/simple-database.iml deleted file mode 100644 index 5655608..0000000 --- a/simple-database.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/nl/astraeus/database/FieldMetaData.java b/src/nl/astraeus/database/FieldMetaData.java index 700c3e4..645d5a0 100644 --- a/src/nl/astraeus/database/FieldMetaData.java +++ b/src/nl/astraeus/database/FieldMetaData.java @@ -78,6 +78,8 @@ sqlTypeMapping.put(int.class, Types.INTEGER); sqlTypeMapping.put(Short.class, Types.SMALLINT); sqlTypeMapping.put(short.class, Types.SMALLINT); + sqlTypeMapping.put(Float.class, Types.DECIMAL); + sqlTypeMapping.put(float.class, Types.DECIMAL); sqlTypeMapping.put(Double.class, Types.DECIMAL); sqlTypeMapping.put(double.class, Types.DECIMAL); sqlTypeMapping.put(Boolean.class, Types.BOOLEAN); @@ -270,6 +272,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { statement.setBigDecimal(index, (BigDecimal) value); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + statement.setFloat(index, (Float) value); } else { statement.setDouble(index, (Double) value); } @@ -356,6 +360,8 @@ case Types.DECIMAL: if (javaType.equals(BigDecimal.class)) { set(obj, rs.getBigDecimal(index)); + } else if (javaType.equals(Float.class) || javaType.equals(float.class)) { + set(obj, rs.getFloat(index)); } else { set(obj, rs.getDouble(index)); } diff --git a/src/nl/astraeus/database/sql/h2/types.sql b/src/nl/astraeus/database/sql/h2/types.sql index ab69dd0..8e3695e 100644 --- a/src/nl/astraeus/database/sql/h2/types.sql +++ b/src/nl/astraeus/database/sql/h2/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB \ No newline at end of file diff --git a/src/nl/astraeus/database/sql/mysql/types.sql b/src/nl/astraeus/database/sql/mysql/types.sql index 8e2824f..f917671 100644 --- a/src/nl/astraeus/database/sql/mysql/types.sql +++ b/src/nl/astraeus/database/sql/mysql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BLOB diff --git a/src/nl/astraeus/database/sql/postgresql/types.sql b/src/nl/astraeus/database/sql/postgresql/types.sql index f0965ab..bbb1ec0 100644 --- a/src/nl/astraeus/database/sql/postgresql/types.sql +++ b/src/nl/astraeus/database/sql/postgresql/types.sql @@ -5,6 +5,7 @@ java.lang.Byte=TINYINT java.lang.Long=BIGINT java.lang.Double=DECIMAL(${precision}, ${scale}) +java.lang.Float=DECIMAL(${precision}, ${scale}) java.math.BigDecimal=DECIMAL(${precision}, ${scale}) java.util.Date=TIMESTAMP java.lang.Object=BYTEA diff --git a/very-simple-templates.iml b/very-simple-templates.iml new file mode 100644 index 0000000..7b61ee1 --- /dev/null +++ b/very-simple-templates.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file