Merge remote-tracking branch 'origin/simple' into simple

Fork: 0

rnentjes / simple-database

Browse code Merge remote-tracking branch 'origin/simple' into simple # Conflicts: # .idea/modules/simple-database_main.iml # .idea/modules/simple-database_test.iml # .idea/workspace.xml master simple
commit 7f8bed0e6242e050edd74202dc47c4a7b75459bc 2 parents eaf2dff + c0293bf rnentjes authored on 11 Dec 2016

Patch

Unified Split

Showing 23 changed files

Ignore Space Show notes View .idea/modules/simple-database.iml

Ignore Space Show notes View .idea/modules/simple-database_main.iml

Ignore Space Show notes View .idea/modules/simple-database_test.iml

Ignore Space Show notes View .idea/workspace.xml

Ignore Space Show notes View src/nl/astraeus/database/SimpleDatabase.java

Ignore Space Show notes View src/nl/astraeus/database/jdbc/ConnectionPool.java

Ignore Space Show notes View src/nl/astraeus/database/jdbc/ConnectionProvider.java

Ignore Space Show notes View test/nl/astraeus/database/BaseTest.java

Ignore Space Show notes View test/nl/astraeus/database/DdlMappingTest.java

Ignore Space Show notes View test/nl/astraeus/database/TestDelete.java

Ignore Space Show notes View test/nl/astraeus/database/TestFind.java

Ignore Space Show notes View test/nl/astraeus/database/TestInsert.java

Ignore Space Show notes View test/nl/astraeus/database/TestMissingReference.java

Ignore Space Show notes View test/nl/astraeus/database/TestReference.java

Ignore Space Show notes View test/nl/astraeus/database/TestSelectAll.java

Ignore Space Show notes View test/nl/astraeus/database/TestSelectFrom.java

Ignore Space Show notes View test/nl/astraeus/database/TestSelectWhere.java

Ignore Space Show notes View test/nl/astraeus/database/TestSimpleDatabaseInsert.java

Ignore Space Show notes View test/nl/astraeus/database/TestUpdate.java

Ignore Space Show notes View test/nl/astraeus/database/sql/TestCreate.java

Ignore Space Show notes View test/nl/astraeus/database/sql/TestInsert.java

Ignore Space Show notes View test/nl/astraeus/database/sql/TestSelect.java

Ignore Space Show notes View test/nl/astraeus/database/sql/TestUpdate.java

Show line notes below