Skip to content

Commit

Permalink
0004659: Added query result editor (#123)
Browse files Browse the repository at this point in the history
  • Loading branch information
@evan-miller-jumpmind
evan-miller-jumpmind committed Nov 25, 2020
1 parent 9dc830b commit 16104e4
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 32 deletions.
12 changes: 2 additions & 10 deletions symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/common/CommonUiUtils.java
View file
Expand Up @@ -33,10 +33,8 @@
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.servlet.ServletContext;
Expand Down Expand Up @@ -203,14 +201,8 @@ public static Grid<List<Object>> putResultsInGrid(final ResultSet rs, int maxRes

List<List<Object>> outerList = new ArrayList<List<Object>>();
if (rs != null) {
final int[] rowCounter = {0};
final Map<List<Object>, Integer> rowNumberMap = new HashMap<List<Object>, Integer>();
grid.addColumn(row -> {
if (!rowNumberMap.containsKey(row)) {
rowCounter[0]++;
rowNumberMap.put(row, rowCounter[0]);
}
return rowNumberMap.get(row);
return outerList.indexOf(row) + 1;
}).setCaption("#").setId("#").setHidden(!showRowNumbers).setStyleGenerator(row -> {
if (!grid.getSelectedItems().contains(row)) {
return "rowheader";
Expand All @@ -235,7 +227,7 @@ public static Grid<List<Object>> putResultsInGrid(final ResultSet rs, int maxRes
columnNames.add(columnName);

Integer colNum = new Integer(columnCounter[0] - 1 - skipColumnIndexes.size());
grid.addColumn(row -> row.get(colNum)).setCaption(columnName).setHidable(true)
grid.addColumn(row -> row.get(colNum)).setId(columnName).setCaption(columnName).setHidable(true)
.setStyleGenerator(row -> {
if (row.get(colNum) == null) {
return "italics";
Expand Down
137 changes: 115 additions & 22 deletions ...ric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/TabularResultLayout.java
View file
Expand Up @@ -27,10 +27,14 @@

import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.sql.DataSource;
Expand All @@ -42,18 +46,21 @@
import org.jumpmind.db.model.Table;
import org.jumpmind.db.platform.DatabaseInfo;
import org.jumpmind.db.platform.IDdlReader;
import org.jumpmind.db.sql.SqlException;
import org.jumpmind.properties.TypedProperties;
import org.jumpmind.util.FormatUtils;
import org.jumpmind.vaadin.ui.common.CommonUiUtils;
import org.jumpmind.vaadin.ui.common.CsvExport;
import org.jumpmind.vaadin.ui.common.GridDataProvider;
import org.jumpmind.vaadin.ui.common.IDataProvider;
import org.jumpmind.vaadin.ui.common.ReadOnlyTextAreaDialog;
import org.jumpmind.vaadin.ui.common.NotifyDialog;
import org.jumpmind.vaadin.ui.sqlexplorer.SqlRunner.ISqlRunnerListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.vaadin.contextmenu.ContextMenu;
import com.vaadin.data.Binder;
import com.vaadin.data.Binder.Binding;
import com.vaadin.data.provider.Query;
import com.vaadin.icons.VaadinIcons;
import com.vaadin.shared.MouseEventDetails.MouseButton;
Expand All @@ -63,8 +70,11 @@
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.Command;
import com.vaadin.ui.MenuBar.MenuItem;
import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.Notification;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.components.grid.Editor;
import com.vaadin.ui.themes.ValoTheme;
import com.vaadin.shared.ui.ContentMode;
import com.vaadin.ui.Grid;
Expand Down Expand Up @@ -95,6 +105,8 @@ public class TabularResultLayout extends VerticalLayout {
String schemaName;

Grid<List<Object>> grid;

Map<Integer, String> columnNameMap;

org.jumpmind.db.model.Table resultTable;

Expand Down Expand Up @@ -157,6 +169,18 @@ protected void createTabularResultLayout() {
try {
grid = putResultsInGrid(settings.getProperties().getInt(SQL_EXPLORER_MAX_RESULTS));
grid.setSizeFull();

columnNameMap = new HashMap<Integer, String>();
ResultSetMetaData meta = rs.getMetaData();
for (int i = 0; i < meta.getColumnCount(); i++) {
String realColumnName = meta.getColumnName(i + 1);
String columnName = realColumnName;
int j = 1;
while (columnNameMap.containsValue(columnName)) {
columnName = realColumnName + "_" + j++;
}
columnNameMap.put(i, columnName);
}

ContextMenu menu = new ContextMenu(grid, true);
menu.addItem(ACTION_SELECT, new MenuBar.Command() {
Expand Down Expand Up @@ -204,31 +228,80 @@ public void menuSelected(MenuItem selectedItem) {
grid.addItemClickListener(event -> {
MouseButton button = event.getMouseEventDetails().getButton();
if (button == MouseButton.LEFT) {
if (event.getMouseEventDetails().isDoubleClick() && event.getColumn() != null) {
String header = event.getColumn().getCaption();
List<Grid.Column<List<Object>, ?>> colList = grid.getColumns();
Object o = null;
for (int i = 1; i < colList.size(); i++) {
if (colList.get(i).getCaption().equals(header)) {
o = event.getItem().get(i - 1);
break;
}
grid.deselectAll();
grid.select(event.getItem());
}
});

Editor<List<Object>> editor = grid.getEditor();
Binder<List<Object>> binder = editor.getBinder();

int i = 0;
for (Grid.Column<List<Object>, ?> col : grid.getColumns()) {
String colId = col.getId();
if (colId == null || !colId.equals("#")) {
Integer index = new Integer(i);
Binding<List<Object>, String> binding = binder.bind(new TextField(),
list -> list.get(index).toString(), (list, value) -> list.set(index, value));
col.setEditorBinding(binding);
i++;
}
}

if (resultTable != null) {
@SuppressWarnings("unchecked")
List<Object>[] unchangedValue = (List<Object>[]) new List[1];
Object[] params = new Object[resultTable.getPrimaryKeyColumnCount() + 1];
int[] types = new int[params.length];

editor.addOpenListener(event -> {
unchangedValue[0] = new ArrayList<Object>(event.getBean());
int paramCount = 1;
for (int j = 0; j < unchangedValue[0].size(); j++) {
if (resultTable.getPrimaryKeyColumnIndex(columnNameMap.get(j)) >= 0) {
params[paramCount] = unchangedValue[0].get(j);
types[paramCount] = resultTable.getColumnWithName(columnNameMap.get(j)).getMappedTypeCode();
paramCount++;
}
if (o != null) {
String data = String.valueOf(o);
boolean binary = resultTable != null ? resultTable.getColumnWithName(header).isOfBinaryType() : false;
if (binary) {
ReadOnlyTextAreaDialog.show(header, data.toUpperCase(), binary);
} else {
ReadOnlyTextAreaDialog.show(header, data, binary);
}
});

editor.addSaveListener(event -> {
grid.setDataProvider(grid.getDataProvider());

List<Object> row = event.getBean();
for (int j = 0; j < row.size(); j++) {
String colName = columnNameMap.get(j);
if (!db.getPlatform().isLob(resultTable.getColumnWithName(colName).getMappedTypeCode())) {
String sql = buildUpdate(resultTable, colName, resultTable.getPrimaryKeyColumnNames());
params[0] = row.get(j);
if ((params[0] == null && unchangedValue[0].get(j) == null)
|| (params[0] != null && params[0].equals(unchangedValue[0].get(j)))) {
continue;
}
types[0] = resultTable.getColumnWithName(colName).getMappedTypeCode();
for (int k = 0; k < types.length; k++) {
if (types[k] == Types.DATE && db.getPlatform().getDdlBuilder().getDatabaseInfo()
.isDateOverridesToTimestamp()) {
types[k] = Types.TIMESTAMP;
}
}
log.warn(sql);
try {
db.getPlatform().getSqlTemplate().update(sql, params, types);
} catch (SqlException e) {
NotifyDialog.show("Error",
"<b>The table could not be updated.</b><br>"
+ "Cause: the sql update statement failed to execute.<br><br>"
+ "To view the <b>Stack Trace</b>, click <b>\"Details\"</b>.",
e, Type.ERROR_MESSAGE);
}
}
} else {
grid.deselectAll();
grid.select(event.getItem());
}
}
});
});

editor.setEnabled(true);
}

this.addComponent(grid);
this.setExpandRatio(grid, 1);
Expand Down Expand Up @@ -706,4 +779,24 @@ protected Grid<List<Object>> putResultsInGrid(int maxResultSize) throws SQLExcep
protected String[] getColumnsToExclude() {
return new String[0];
}

protected String buildUpdate(Table table, String columnName, String[] pkColumnNames) {
StringBuilder sql = new StringBuilder("update ");
DatabaseInfo dbInfo = db.getPlatform().getDatabaseInfo();
String quote = db.getPlatform().getDdlBuilder().isDelimitedIdentifierModeOn() ? dbInfo.getDelimiterToken() : "";
sql.append(table.getQualifiedTableName(quote, dbInfo.getCatalogSeparator(), dbInfo.getSchemaSeparator()));
sql.append(" set ");
sql.append(quote);
sql.append(columnName);
sql.append(quote);
sql.append("=? where ");
for (String col : pkColumnNames) {
sql.append(quote);
sql.append(col);
sql.append(quote);
sql.append("=? and ");
}
sql.delete(sql.length() - 5, sql.length());
return sql.toString();
}
}

0 comments on commit 16104e4

Please sign in to comment.