Revize 830a7e2e

re #8176 nothing; re #8178 added checks for data types; added table name to the generated table

src/main/java/vldc/aswi/service/SqlQueryManagerImpl.java

@@ -5 +5 @@
 import org.springframework.stereotype.Service;
 import vldc.aswi.database.DatabaseInterface;
 import vldc.aswi.domain.Assembly;
-import vldc.aswi.domain.Configuration;
 import vldc.aswi.domain.Function;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.model.table.NameUserName;
@@ -35 +34 @@
      * @param assembly Assembly from which configuration was created.
      * @param parametersInConfiguration Parameters in configuration with their locations and operators.
      * @param isNotRemoveEmpty Sets if empty rows and columns should not be removed.
-     * @return List of contingencyTableRow.
+     * @param tableName Name of the table.
+     * @return List of contingencyTableRow or null, if error in SQL query occurred.
      */
     @Override
     public List<ContingencyTableRow> getContingencyTableRow(Assembly assembly,
                                                             List<ParameterInConfiguration> parametersInConfiguration,
-                                                            boolean isNotRemoveEmpty) {
+                                                            boolean isNotRemoveEmpty, String tableName) {
         long startTime = System.nanoTime();
 
         Map<String, TableColumn> tableColumns = this.databaseInterface.executeQueryAndReturnTableColumns(
                 generateFullSQLQuery(assembly.getSQLQuery(), parametersInConfiguration)
         );
 
+        if (tableColumns == null) {
+            return null;
+        }
+
+        if (tableColumns.values().iterator().next().getValues().size() == 0) {
+            return new ArrayList<>();
+        }
+
         long stopTime = System.nanoTime();
         System.out.println("Select:" + TimeUnit.MILLISECONDS.convert((stopTime - startTime), TimeUnit.NANOSECONDS));
         List<NameUserName> rowNames = new ArrayList<>();
@@ -61 +69 @@
 
         initializeContingencyTableDataLists(rowNames, columnNames, valueFunctions, copiedParametersInConfiguration);
 
-        Converter converter = new Converter(tableColumns, rowNames, columnNames, valueFunctions, isNotRemoveEmpty);
+        Converter converter = new Converter(tableColumns, rowNames, columnNames, valueFunctions, isNotRemoveEmpty, tableName);
         return converter.convertTableColumnsToContingencyTableRows();
     }
 
@@ -84 +92 @@
         return this.databaseInterface.getNameOfColumnsFromQuery(sqlQuery);
     }
 
+    /**
+     * Initializes list with values.
+     * @param rowNames List of selected rows.
+     * @param columnNames List of selected columns.
+     * @param valueFunctions List of selected values and functions.
+     * @param parametersInConfiguration List of parameters in configuration.
+     */
     private void initializeContingencyTableDataLists(List<NameUserName> rowNames, List<NameUserName> columnNames,
                                                      List<ValueFunction> valueFunctions, List<ParameterInConfiguration> parametersInConfiguration) {
         for (ParameterInConfiguration parameterInConfiguration : parametersInConfiguration) {
@@ -151 +166 @@
     }
 
     /**
-     * Precesses listing (enum) type.
+     * Processes listing (enum) type.
      * @param parameterInConfiguration Listing type parameter iin configuration.
      * @param finalSQLQuery Resulting SQL query.
      * @param isWhereDefined Variable storing information if WHERE clause was defined in the resulting SQL query.
@@ -240 +255 @@
         StringBuilder SQLQueryPart = new StringBuilder();
         SQLQueryPart.append("(");
         for (int i = 0; i < values.length; i++) {
+            if (type.equals("Datum")) {
+                SQLQueryPart.append("date ");
+            }
+
             addQuotes(type, SQLQueryPart);
             SQLQueryPart.append(values[i]);
             addQuotes(type, SQLQueryPart);
@@ -261 +280 @@
     private String betweenNotBetween(String[] values, String type) {
         StringBuilder SQLQueryPart = new StringBuilder();
 
+        if (type.equals("Datum")) {
+            SQLQueryPart.append("date ");
+        }
+
         addQuotes(type, SQLQueryPart);
         SQLQueryPart.append(values[0]);
         addQuotes(type, SQLQueryPart);
 
         SQLQueryPart.append(" AND ");
 
+        if (type.equals("Datum")) {
+            SQLQueryPart.append("date ");
+        }
+
         addQuotes(type, SQLQueryPart);
         SQLQueryPart.append(values[1]);
         addQuotes(type, SQLQueryPart);
@@ -283 +310 @@
     private String otherOperators(String[] values, String type) {
         StringBuilder SQLQueryPart = new StringBuilder();
 
+        if (type.equals("Datum")) {
+            SQLQueryPart.append("date ");
+        }
+
         addQuotes(type, SQLQueryPart);
         SQLQueryPart.append(values[0]);
         addQuotes(type, SQLQueryPart);