Started Default SqlConnection

pom.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.kreth</groupId>
@@ -42,10 +44,22 @@
 	</distributionManagement>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>2.18.3</version>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	<scm>

src/main/java/de/kreth/dbmanager/Constraint.java

@@ -0,0 +1,5 @@
+package de.kreth.dbmanager;
+
+public interface Constraint {
+
+}

src/main/java/de/kreth/dbmanager/SqlConnection.java

@@ -0,0 +1,157 @@
+package de.kreth.dbmanager;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SqlConnection implements Database {
+
+	private final Connection con;
+	private final Logger logger;
+	private TableDefinition version;
+	
+	public SqlConnection(Connection connection, DatabaseType dbType) {
+		super();
+		this.con = connection;
+		this.logger = LoggerFactory.getLogger(getClass());
+
+		ColumnDefinition colVersion = new ColumnDefinition(DataType.INTEGER,
+				"version", "NOT NULL");
+		ArrayList<ColumnDefinition> columns = new ArrayList<ColumnDefinition>();
+		columns.add(colVersion);
+		this.version = new TableDefinition("version", dbType, columns);
+	}
+
+	private void tryConnectVersionTable() {	
+		try {
+			Statement stm = con.createStatement();
+			String sql = DbManager.createSqlStatement(version);
+			stm.execute(sql);
+		} catch (SQLException e) {
+			logger.warn("Error creating version table", e);
+		}
+	}
+
+	@Override
+	public void beginTransaction() throws SQLException {
+		con.setAutoCommit(false);
+	}
+
+	@Override
+	public void setTransactionSuccessful() throws SQLException {
+		if (!con.getAutoCommit())
+			con.commit();
+		con.setAutoCommit(true);
+	}
+
+	@Override
+	public void endTransaction() throws SQLException {
+		if (!con.getAutoCommit())
+			con.rollback();
+		con.setAutoCommit(true);
+	}
+
+	@Override
+	public void execSQL(String sql) throws SQLException {
+		con.createStatement().execute(sql);
+	}
+
+	@Override
+	public void execSQL(String sql, Object[] bindArgs) throws SQLException {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public int getVersion() {
+		int version = 0;
+		Statement stm = null;
+		ResultSet rs = null;
+		try {
+			stm = con.createStatement();
+			rs = stm.executeQuery("SELECT version FROM version");
+			if (rs.next())
+				version = rs.getInt("version");
+
+		} catch (SQLException e) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Error on Database fetch version, version 0?", e);
+			}
+			tryConnectVersionTable();
+		} finally {
+			if (stm != null)
+				try {
+					stm.close();
+				} catch (SQLException e) {
+					if (logger.isDebugEnabled()) {
+						logger.debug("Error on Database close", e);
+					}
+				}
+		}
+
+		return version;
+	}
+
+	@Override
+	public long insert(String table, List<DbValue> values) throws SQLException {
+		return 0;
+	}
+
+	@Override
+	public boolean needUpgrade(int newVersion) {
+		return false;
+	}
+
+	@Override
+	public Iterator<Collection<DbValue>> query(String table, String[] columns)
+			throws SQLException {
+		return null;
+	}
+
+	@Override
+	public void setVersion(int version) {
+		Statement stm = null;
+		boolean autoCommit = true;
+		try {
+			autoCommit = con.getAutoCommit();
+			con.setAutoCommit(false);
+			stm = con.createStatement();
+			int rows = stm
+					.executeUpdate("UPDATE version SET version = " + version);
+			if (rows == 1)
+				con.commit();
+			else
+				con.rollback();
+		} catch (SQLException e) {
+
+			try {
+				con.rollback();
+			} catch (SQLException e1) {
+				logger.error("Error on database rollback after exception "
+						+ e.getMessage(), e1);
+			}
+			logger.error("Error updating verions", e);
+		} finally {
+			try {
+				con.setAutoCommit(autoCommit);
+			} catch (SQLException e) {
+				logger.info("Error restoring autocommit to " + autoCommit, e);
+			}
+		}
+
+	}
+
+	@Override
+	public int delete(String table, String whereClause, String[] whereArgs)
+			throws SQLException {
+		return 0;
+	}
+
+}

src/main/java/de/kreth/dbmanager/UniqueConstraint.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class UniqueConstraint {
+public class UniqueConstraint implements Constraint {
 	private List<String> names = new ArrayList<>();
 	
 	public UniqueConstraint(ColumnDefinition... defs) {

src/test/java/de/kreth/dbmanager/SqlConnectionTest.java

@@ -0,0 +1,73 @@
+package de.kreth.dbmanager;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class SqlConnectionTest {
+
+	private Connection connection;
+	private Statement statement;
+	private ResultSet rs;
+	
+	@Before
+	public void initMocks() throws SQLException {
+		connection = mock(Connection.class);
+		statement = mock(Statement.class);
+		rs = mock(ResultSet.class);
+		when(connection.createStatement()).thenReturn(statement);
+	}
+
+	@Test
+	public void testTransactionSuccessfull() throws SQLException {
+		SqlConnection con = new SqlConnection(connection, DatabaseType.HSQLDB);
+		con.beginTransaction();
+		verify(connection, times(1)).setAutoCommit(false);
+		con.setTransactionSuccessful();
+		verify(connection, times(1)).commit();
+		verify(connection, times(1)).setAutoCommit(true);
+	}
+
+	@Test
+	public void testTransactionRollback() throws SQLException {
+		SqlConnection con = new SqlConnection(connection, DatabaseType.HSQLDB);
+		con.beginTransaction();
+		verify(connection, times(1)).setAutoCommit(false);
+		con.endTransaction();
+		verify(connection, times(1)).rollback();
+		verify(connection, times(1)).setAutoCommit(true);
+	}
+
+	@Test
+	public void testGetVersion() throws SQLException {
+		when(rs.next()).thenReturn(false);
+		when(statement.executeQuery(anyString())).thenReturn(rs);
+		SqlConnection con = new SqlConnection(connection, DatabaseType.HSQLDB);
+		int version = con.getVersion();
+		assertEquals(0, version);
+	}
+
+	@Test
+	public void testGetVersionWithoutTable() throws SQLException {
+		when(statement.executeQuery(anyString())).thenThrow(SQLException.class);
+
+		SqlConnection con = new SqlConnection(connection, DatabaseType.HSQLDB);
+		int version = con.getVersion();
+		assertEquals(0, version);
+	}
+	
+	@Test
+	public void testSetVersionSuccessfull() throws SQLException {
+		SqlConnection con = new SqlConnection(connection, DatabaseType.HSQLDB);
+		when(statement.executeUpdate(anyString())).thenReturn(1);
+		con.setVersion(2);
+		verify(connection, times(1)).commit();
+	}
+}