DELETE finished

Author: EliasHdzR

ExceptionFramework/src/main/java/edu/upvictoria/poo/Analyzer.java

@@ -126,13 +126,13 @@ public void analyzeSyntax(String line) throws Exception {
                             }
 
                             refreshDB(this.database.getDbFile());
-                            sql.handleDeleteFrom(line, keyword);
+                            sql.handleDeleteFrom(line, keyword, database);
                             refreshDB(this.database.getDbFile());
                             return;
 
                         case "UPDATE":
                             refreshDB(this.database.getDbFile());
-                            sql.handleUpdate(line, keyword);
+                            sql.handleUpdate(line, keyword, this.database);
                             refreshDB(this.database.getDbFile());
                             return;
 

ExceptionFramework/src/main/java/edu/upvictoria/poo/SQL.java

@@ -2,6 +2,7 @@
 
 import edu.upvictoria.poo.exceptions.*;
 
+import javax.xml.crypto.Data;
 import java.io.*;
 import java.nio.file.*;
 import java.util.ArrayList;
@@ -20,7 +21,7 @@ public String clean(String line, String keyword) throws StringIndexOutOfBoundsEx
             throw new StringIndexOutOfBoundsException();
         }
 
-        return line;
+        return line.trim();
     }
 
     public File handleUse(String line, String keyword) throws FileSystemException, StringIndexOutOfBoundsException, FileNotFoundException {
@@ -357,32 +358,71 @@ public void handleInsertInto(String line, String keyword, Database database) thr
         table.appendDataToTable(insertionData,insertionColumns);
     }
 
-    public void handleDeleteFrom(String line, String keyword){
+    public void handleDeleteFrom(String line, String keyword, Database database) throws IOException, StringIndexOutOfBoundsException, NoSuchFileException{
+        String cleanedLine, selectedTable, whereLine = null;
+        boolean tableExists = false;
+        ArrayList<String> whereTokens;
+        ArrayList<ArrayList<Object>> wheredData;
+
+        try{
+            cleanedLine = clean(line, keyword);
+            if(cleanedLine.contains("WHERE")){
+                selectedTable = cleanedLine.substring(0,cleanedLine.indexOf(" ")).trim();
+                whereLine = cleanedLine.substring(cleanedLine.indexOf("WHERE") + "WHERE".length() + 1).trim();
+            } else {
+                selectedTable = cleanedLine;
+            }
+        } catch (StringIndexOutOfBoundsException e){
+            throw new StringIndexOutOfBoundsException();
+        }
+
+        ArrayList<Table> tables = database.getTables();
+        for(Table table : tables){
+            if(table.getTableName().equals(selectedTable)){
+                tableExists = true;
+
+                if(whereLine != null){
+                    whereTokens = getWhereTokens(whereLine,table);
+                    whereTokens = Where.infixToPostfix(whereTokens);
+                    Tree.Node root = Where.createTree(whereTokens);
+                    wheredData = Where.evaluateTree(root, table.getData(), table);
+                } else {
+                    wheredData = table.getData();
+                }
+
+                ArrayList<ArrayList<Object>> pureData = new ArrayList<>(table.getData());
+                pureData.removeAll(wheredData);
+                table.setData(pureData);
+                table.writeDataToFile();
+            }
+        }
+
+        if(!tableExists){
+            throw new NoSuchFileException("TABLE DOES NOT EXISTS");
+        }
     }
 
-    public void handleUpdate(String line, String keyword){
+    public void handleUpdate(String line, String keyword, Database database) throws SQLSyntaxException, StringIndexOutOfBoundsException {
+
     }
 
-    public void handleSelect(String line, String keyword, Database database) throws SQLSyntaxException,
-            StringIndexOutOfBoundsException, NoSuchFileException, ColumnDoesNotMatch {
+    public void handleSelect(String line, String keyword, Database database) throws SQLSyntaxException, StringIndexOutOfBoundsException, NoSuchFileException, ColumnDoesNotMatch {
         ArrayList<String> columns = new ArrayList<>();
         ArrayList<String> showingCol = new ArrayList<>();
         String cleanedLine, selectedColumns, selectedTable, whereLine = null;
         ArrayList<String> whereTokens;
-        ArrayList<ArrayList<Object>> wheredData = new ArrayList<>();
+        ArrayList<ArrayList<Object>> wheredData;
         boolean tableExists = false;
 
         try{
             cleanedLine = clean(line, keyword);
             selectedColumns = cleanedLine.substring(0,cleanedLine.indexOf("FROM")-1).trim();
 
             if(cleanedLine.contains("WHERE")){
-                selectedTable = cleanedLine.substring(cleanedLine.indexOf("FROM ") + "FROM".length() + 1,
-                        cleanedLine.indexOf(" WHERE")).trim();
+                selectedTable = cleanedLine.substring(cleanedLine.indexOf("FROM ") + "FROM".length() + 1, cleanedLine.indexOf(" WHERE")).trim();
                 whereLine = cleanedLine.substring(cleanedLine.indexOf("WHERE") + "WHERE".length() + 1).trim();
             } else {
-                selectedTable = cleanedLine.substring(cleanedLine.indexOf("FROM ") +
-                        "FROM".length() + 1).trim();
+                selectedTable = cleanedLine.substring(cleanedLine.indexOf("FROM ") + "FROM".length() + 1).trim();
             }
 
             if(!selectedColumns.equals("*")){
@@ -440,9 +480,6 @@ public ArrayList<String> getWhereTokens(String line, Table table) throws SQLSynt
         ArrayList<String> whereTokens = new ArrayList<>();
         String value;
 
-        /*ArrayList<String> homunculus = new ArrayList<>(analyzer.getOperators());
-        homunculus.addAll(table.getColumnsName());*/
-
         String format1 = "^'.+'";
         String format2 = "^\\d*\\s+";
         String format3 = "^\\d*$";

ExceptionFramework/src/main/java/edu/upvictoria/poo/Table.java

@@ -19,7 +19,7 @@ public class Table {
     private final String tableName;
     private final File tableFile;
     private final ArrayList<Column> columns;
-    private final ArrayList<ArrayList<Object>> data =  new ArrayList<>();
+    private ArrayList<ArrayList<Object>> data =  new ArrayList<>();
 
     //para crear nueva tabla
     public Table(File tableFile, ArrayList<Column> columns){
@@ -87,6 +87,10 @@ public ArrayList<ArrayList<Object>> getData() {
         return data;
     }
 
+    public void setData(ArrayList<ArrayList<Object>> data) {
+        this.data = data;
+    }
+
     public void appendDataToTable(ArrayList<String> data, ArrayList<String> columnNames) throws IOException {
         ArrayList<Object> newData = new ArrayList<>();
 
@@ -202,6 +206,7 @@ public void printData(ArrayList<ArrayList<Object>> data){
             }
             System.out.println("+");
         }
+        System.out.println();
     }
 
     public void printData(ArrayList<String> columns, ArrayList<ArrayList<Object>> data) {
@@ -234,6 +239,7 @@ public void printData(ArrayList<String> columns, ArrayList<ArrayList<Object>> da
             }
             System.out.println("+");
         }
+        System.out.println();
     }
 
     public ArrayList<String> getColumnsName(){