Skip to content
Snippets Groups Projects
Commit 61cd8bd1 authored by Moritz Staudinger's avatar Moritz Staudinger
Browse files

Fixed datatypes in getAllRows

parent f5c0ed8f
No related branches found
No related tags found
3 merge requests!23Sprint results,!18Merge Conflicts,!17UI sprint 2
...@@ -3,6 +3,7 @@ package at.tuwien.service; ...@@ -3,6 +3,7 @@ package at.tuwien.service;
import at.tuwien.dto.table.TableCreateDto; import at.tuwien.dto.table.TableCreateDto;
import at.tuwien.dto.table.columns.ColumnCreateDto; import at.tuwien.dto.table.columns.ColumnCreateDto;
import at.tuwien.dto.table.columns.ColumnTypeDto; import at.tuwien.dto.table.columns.ColumnTypeDto;
import at.tuwien.entity.ColumnType;
import at.tuwien.entity.Database; import at.tuwien.entity.Database;
import at.tuwien.entity.Table; import at.tuwien.entity.Table;
import at.tuwien.entity.TableColumn; import at.tuwien.entity.TableColumn;
...@@ -97,10 +98,19 @@ public class PostgresService extends JdbcConnector { ...@@ -97,10 +98,19 @@ public class PostgresService extends JdbcConnector {
while(result.next()) { while(result.next()) {
Map<String,Object> r = new HashMap<>(); Map<String,Object> r = new HashMap<>();
for(TableColumn tc : t.getColumns()) { for(TableColumn tc : t.getColumns()) {
if(tc.getColumnType() == ColumnType.NUMBER) {
r.put(tc.getName(), result.getDouble(tc.getInternalName()));
}
if(tc.getColumnType() == ColumnType.BOOLEAN) {
r.put(tc.getName(), result.getBoolean(tc.getInternalName()));
}
else {
r.put(tc.getName(), result.getString(tc.getInternalName())); r.put(tc.getName(), result.getString(tc.getInternalName()));
} }
}
res.add(r); res.add(r);
} }
log.debug(res.toString());
qr.setResult(res); qr.setResult(res);
return qr; return qr;
} catch(DatabaseConnectionException e) { } catch(DatabaseConnectionException e) {
......
...@@ -229,6 +229,7 @@ public class TableService { ...@@ -229,6 +229,7 @@ public class TableService {
c.setName(header[i]); c.setName(header[i]);
c.setType(headers.getColumns().get(i)); c.setType(headers.getColumns().get(i));
c.setNullAllowed(true); c.setNullAllowed(true);
//TODO FIX THAT not only id is primary key
if(header[i].equals("id")) { if(header[i].equals("id")) {
c.setPrimaryKey(true); c.setPrimaryKey(true);
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment