Changed sql executor

src/formula/FunctionFormula.java

@@ -234,7 +234,7 @@ private String solveSum() throws FormulaException {
 
 			// return empty value if empty operand
 			if (operand.isEmpty()) {
-				LOGGER.warn("Warning: An operand of the SUM function is empty. Operands: " + operands + ". Returning empty value");
+				LOGGER.info("Warning: An operand of the SUM function is empty. Operands: " + operands + ". Returning empty value");
 				return "";
 			}
 

src/table_database/DatabaseBuilder.java

@@ -13,6 +13,7 @@
 
 import app_config.AppPaths;
 import app_config.PropertiesReader;
+import sql.SQLExecutor;
 import table_skeleton.TableColumn;
 import xlsx_reader.TableSchema;
 import xlsx_reader.TableSchemaList;
@@ -41,19 +42,13 @@ public void create(String path) throws IOException {
 		String query = queryCreator.getCreateDatabaseQuery(TableSchemaList.getAll());
 
 		// create the database
-		try {
-
-			// set a "create" connection
-			DriverManager.getConnection(DB_URL);
-
-			// sql script to create the database
-			SQLScriptExec script = new SQLScriptExec(DB_URL);
-
-			script.exec(query);
+		try(Connection con = DriverManager.getConnection(DB_URL);
+				SQLExecutor executor = new SQLExecutor(con);) {
+			executor.exec(query);
 
 			addDbInfo();
 
-		} catch ( IOException | SQLException e ) {
+		} catch (IOException | SQLException e) {
 			e.printStackTrace();
 			LOGGER.error("Cannot create database in folder=" + path, e);
 			return;
@@ -71,40 +66,49 @@ public void createTable(TableSchema table) throws SQLException, IOException {
 
 		DatabaseStructureCreator creator = new DatabaseStructureCreator();
 		String query = creator.getNewTableQuery(table);
-		SQLScriptExec script = new SQLScriptExec(DB_URL);
-		script.exec(query);
+
+		try(Connection con = DriverManager.getConnection(DB_URL);
+				SQLExecutor executor = new SQLExecutor(con);) {
+			executor.exec(query);
+		}
 	}
 
 	/**
 	 * Add a column to a table
 	 * @param schema
 	 * @param column
 	 * @throws IOException
+	 * @throws SQLException 
 	 */
-	public void addColumnToTable(TableSchema schema, TableColumn column) throws IOException {
+	public void addColumnToTable(TableSchema schema, TableColumn column) throws IOException, SQLException {
 
 		DatabaseStructureCreator creator = new DatabaseStructureCreator();
 
 		String query = creator.getAddNewColumnQuery(schema.getSheetName(), column);
 
-		SQLScriptExec script = new SQLScriptExec(DB_URL);
-		script.exec(query);
+		try(Connection con = DriverManager.getConnection(DB_URL);
+				SQLExecutor executor = new SQLExecutor(con);) {
+			executor.exec(query);
+		}
 	}
 
 	/**
 	 * Add a foreign key to the database
 	 * @param schema
 	 * @param foreignKey
 	 * @throws IOException
+	 * @throws SQLException 
 	 */
-	public void addForeignKey(TableSchema schema, TableColumn foreignKey) throws IOException {
+	public void addForeignKey(TableSchema schema, TableColumn foreignKey) throws IOException, SQLException {
 
 		DatabaseStructureCreator creator = new DatabaseStructureCreator();
 
 		String query = creator.getAddForeignKeyQuery(schema.getSheetName(), foreignKey);
 
-		SQLScriptExec script = new SQLScriptExec(DB_URL);
-		script.exec(query);
+		try(Connection con = DriverManager.getConnection(DB_URL);
+				SQLExecutor executor = new SQLExecutor(con);) {
+			executor.exec(query);
+		}
 	}
 
 	/**
@@ -122,8 +126,10 @@ public void removeForeignKey(TableSchema schema, TableColumn foreignKey)
 		String query = creator.getRemoveForeignKeyQuery(schema.getSheetName(), 
 				foreignKey.getId());
 
-		SQLScriptExec script = new SQLScriptExec(DB_URL);
-		script.exec(query);
+		try(Connection con = DriverManager.getConnection(DB_URL);
+				SQLExecutor executor = new SQLExecutor(con);) {
+			executor.exec(query);
+		}
 	}
 
 	/**

src/table_database/DatabaseUpdater.java

@@ -141,8 +141,9 @@ private void addTable(TableSchema table) throws SQLException, IOException {
 	 * @param newTable
 	 * @param newCol
 	 * @throws IOException
+	 * @throws SQLException 
 	 */
-	private void addColumn(TableSchema newTable, TableColumn newCol) throws IOException {
+	private void addColumn(TableSchema newTable, TableColumn newCol) throws IOException, SQLException {
 		DatabaseBuilder db = new DatabaseBuilder();
 		db.addColumnToTable(newTable, newCol);
 	}