Started implementing a way to verify the db scheme prior to accessing

the db.

src/de/katho/kBorrow/db/SqliteConnector.java

@@ -1,12 +1,14 @@
 package de.katho.kBorrow.db;
 
+import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Hashtable;
 
 /**
  * @class sqliteConnector
@@ -17,26 +19,46 @@ import java.sql.Statement;
 public class SqliteConnector implements DbConnector {
 	private Connection connection;
 	private String dbHandle;
+	private Hashtable<String, String> sqlScheme;
 	
 	/**
 	 * @param pHandle This string contains the path to database file the connector has to use
 	 * @throws FileNotFoundException, SQLException
 	 */
 	public SqliteConnector(String pHandle) {
-		this.dbHandle = pHandle;
-	
-		try {
-			Class.forName("org.sqlite.JDBC");	
-			System.out.println(this.dbHandle);
-			this.connection = DriverManager.getConnection("jdbc:sqlite:"+this.dbHandle);
 			
-			System.out.println(this.isConfigured());
+		this.dbHandle = pHandle;
+		this.loadScheme();
+		
+		try {
+			File dbFile = new File(this.dbHandle);
+			Class.forName("org.sqlite.JDBC");
+			
+			if(dbFile.exists()){
+				if(dbFile.isFile()){
+					this.connection = DriverManager.getConnection("jdbc:sqlite:"+this.dbHandle);
+					
+					//Pr<50>fe Schema
+				}
+				else {
+					throw new IOException("Provided db handle may not be a file but a directory or a symlink!");
+				}
+			}
+			else {
+				dbFile.createNewFile();
+				
+				this.connection = DriverManager.getConnection("jdbc:sqlite:"+this.dbHandle);
+				//INitialisiere
+			}			
 		}
 		catch (ClassNotFoundException e){
 			e.printStackTrace();
 		} catch (SQLException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
 		}
 	}
 	
@@ -56,4 +78,49 @@ public class SqliteConnector implements DbConnector {
 		}
 	}
 	
+	private void loadScheme(){
+		this.sqlScheme = new Hashtable<String, String>();
+		
+		this.sqlScheme.put("kborrow",
+				"CREATE TABLE kborrow ("
+					+ "setting_name TEXT,"
+					+ "value INT"
+				+ ")");
+		
+		this.sqlScheme.put("article",
+				"CREATE TABLE article ("
+					+ "id INT PRIMARY KEY,"
+					+ "name TEXT NOT NULL,"
+					+ "description TEXT"
+				+ ")");
+		
+		this.sqlScheme.put("lender",
+				"CREATE TABLE lender ("
+					+ "id INT PRIMARY KEY,"
+					+ "name TEXT,"
+					+ "surname TEXT,"
+					+ "student_number INT,"
+					+ "comment TEXT"
+				+ ")");
+		
+		this.sqlScheme.put("user",
+				"CREATE TABLE user ("
+					+ "id INT PRIMARY KEY,"
+					+ "name TEXT,"
+					+ "surname TEXT"
+				+ ")");
+		
+		this.sqlScheme.put("lending",
+				"CREATE TABLE lending ("
+					+ "id INT PRIMARY KEY,"
+					+ "article_id INT,"
+					+ "user_id INT,"
+					+ "lender_id INT,"
+					+ "start_date DATE DEFAULT CURRENT_DATE,"
+					+ "expected_end_date DATE,"
+					+ "end_date DATE,"
+					+ "comment TEXT"
+				+ ")");
+	}
+	
 }

src/de/katho/kBorrow/db/sqlite_init.sql

@@ -31,11 +31,5 @@ CREATE TABLE lending (
 	start_date DATE DEFAULT current_date,
 	expected_end_date DATE,
 	end_date DATE,
-	comment
-);
-
-insert into kborrow
-	(setting_name, value)
-	VALUES
-	('is_configured', 1)
-;
+	comment TEXT
+);