fixed select, where still wip

Author: EliasHdzR

.idea/uiDesigner.xml

@@ -33,10 +33,8 @@ public Analyzer(){
         keywords.add("FROM");
         keywords.add("WHERE");
 
-        dataModifiers.add("NULL");
         dataModifiers.add("AND");
         dataModifiers.add("OR");
-        dataModifiers.add("NOT");
         dataModifiers.add("AS");
 
         constraints.add("NOT NULL");
@@ -186,6 +184,10 @@ public ArrayList<String> getConstraints() {
         return constraints;
     }
 
+    public ArrayList<String> getDataModifiers() {
+        return dataModifiers;
+    }
+
     public void refreshDB(File file) throws FileSystemException{
         this.database = new Database();
         this.database.setDbFile(file);

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

@@ -279,9 +279,14 @@ public ArrayList<String> splitInsertionColumns (String line, boolean splittingCo
                 throw new StringIndexOutOfBoundsException();
             }
 
-            line = line.substring(line.indexOf("(") + 1,line.indexOf(")"));
+            line = line.substring(line.indexOf("(") + 1,line.indexOf(")")).trim();
 
             String[] values = line.split(",");
+
+            for(int i = 0; i < values.length; i++){
+                values[i] = values[i].trim();
+            }
+
             columns.addAll(Arrays.asList(values));
 
             return columns;
@@ -370,7 +375,7 @@ public void handleSelect(String line, String keyword, Database database) throws
             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"));
+                selectedTable = cleanedLine.substring(cleanedLine.indexOf("FROM ") + "FROM".length() + 1, cleanedLine.indexOf(" WHERE")).trim();
             } else {
                 selectedTable = cleanedLine.substring(cleanedLine.indexOf("FROM ") + "FROM".length() + 1).trim();
             }
@@ -390,10 +395,10 @@ public void handleSelect(String line, String keyword, Database database) throws
                 tableExists = true;
 
                 if(!selectedColumns.equals("*")){
-                    for(String tableCol : table.getColumnsName()){
-                        for(String selecCol : columns) {
-                            if(tableCol.equals(selecCol)){
-                                showingCol.add(tableCol);
+                    for(String tableColName : table.getColumnsName()){
+                        for(String selectColName : columns) {
+                            if(tableColName.equals(selectColName)){
+                                showingCol.add(tableColName);
                             }
                         }
                     }
@@ -415,8 +420,12 @@ public void handleSelect(String line, String keyword, Database database) throws
             throw new NoSuchFileException("TABLE DOES NOT EXISTS");
         }
     }
-}
 
+    public void handleWhere(Analyzer analyzer){
+        ArrayList<String> dataModifiers = analyzer.getDataModifiers();
+    }
+}
 
-// TODO: CREAR EL WHERE
-// TODO: CHECAR EL SELECT
+// TODO: COMPROBRAR QUE SE INGRESA UN TIPO DE DATO CORRECTO AL CREAR UN REGISTRO
+// TODO: COMPROBRAR QUE NO SE ELIGEN DOS COLUMNAS IGUALES A LAS QUE INGRESAR UN REGISTRO
+// TODO: CREAR EL WHERE

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

@@ -185,7 +185,7 @@ public void writeDataToFile(ArrayList<String> rowData) throws IOException {
     public void printData(){
         for (ArrayList<Object> datum : data) {
             for (Object object : datum) {
-                System.out.print("| " + object + "\t");
+                System.out.print("| " + object.toString() + "\t");
             }
             System.out.println("|");
             for (int i = 0; i < datum.size(); i++) {
@@ -196,19 +196,34 @@ public void printData(){
     }
 
     public void printData(ArrayList<String> columns) {
-        ArrayList<Integer> columnIndexes = new ArrayList<>();
-        for(String column : columns){
-            int i = data.get(0).indexOf(column);
-            if (i != -1) {
-                columnIndexes.add(i);
-            }
+        for(String colName : columns){
+            System.out.print("| " + colName + "\t");
+        }
+        System.out.println("|");
+        for (int i = 0; i < columns.size(); i++) {
+            System.out.print("+------------");
         }
+        System.out.println("+");
+
+        // imprimirmos datos
+        for (ArrayList<Object> datum : data) {
+            int j = 0;
+            for (int i = 0; i < datum.size(); i++) {
+                if(this.columns.get(i).getName().equals(columns.get(j))){
+                    Object object = datum.get(i);
+                    System.out.print("| " + object.toString() + "\t");
+                    j++;
 
-        for(ArrayList<Object> datum : data){
-            for(int columnIndex : columnIndexes){
-                System.out.print(datum.get(columnIndex) + " | ");
+                    if(j == columns.size()){
+                        break;
+                    }
+                }
+            }
+            System.out.println("|");
+            for (int i = 0; i < columns.size(); i++) {
+                System.out.print("+------------");
             }
-            System.out.println();
+            System.out.println("+");
         }
     }