From f56348742f84d7b6090d9b2d5ee5856f8b9f0f23 Mon Sep 17 00:00:00 2001 From: hangum Date: Tue, 16 Jan 2018 02:21:50 +0900 Subject: [PATCH] =?utf8?q?-=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9?= =?utf8?q?=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../start/ApplicationWorkbenchWindowAdvisor.java | 1 - .../sqlscripts/scripts/AbstractRDBDDLScript.java | 1 - .../sql/util/tables/SQLHistoryCreateColumn.java | 138 --------------------- .../editors/main/composite/ResultSetComposite.java | 23 ++-- .../core/viewers/connections/ManagerViewer.java | 15 +-- 5 files changed, 16 insertions(+), 162 deletions(-) delete mode 100644 com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/tables/SQLHistoryCreateColumn.java diff --git a/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationWorkbenchWindowAdvisor.java b/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationWorkbenchWindowAdvisor.java index e831d7fef..d46e179d3 100644 --- a/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationWorkbenchWindowAdvisor.java +++ b/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationWorkbenchWindowAdvisor.java @@ -36,7 +36,6 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor; import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine; import com.hangum.tadpole.commons.libs.core.define.SystemDefine; import com.hangum.tadpole.commons.libs.core.message.CommonMessages; -import com.hangum.tadpole.commons.util.ApplicationArgumentUtils; import com.hangum.tadpole.commons.util.IPUtil; import com.hangum.tadpole.commons.util.RequestInfoUtils; import com.hangum.tadpole.engine.manager.TadpoleApplicationContextManager; diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/sqlscripts/scripts/AbstractRDBDDLScript.java b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/sqlscripts/scripts/AbstractRDBDDLScript.java index f9da7ce68..a44fdcc26 100644 --- a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/sqlscripts/scripts/AbstractRDBDDLScript.java +++ b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/sqlscripts/scripts/AbstractRDBDDLScript.java @@ -14,7 +14,6 @@ import java.util.List; import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine; import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine.OBJECT_TYPE; -import com.hangum.tadpole.engine.Messages; import com.hangum.tadpole.engine.query.dao.mysql.InformationSchemaDAO; import com.hangum.tadpole.engine.query.dao.mysql.ProcedureFunctionDAO; import com.hangum.tadpole.engine.query.dao.mysql.TableDAO; diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/tables/SQLHistoryCreateColumn.java b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/tables/SQLHistoryCreateColumn.java deleted file mode 100644 index b62bf90ea..000000000 --- a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/sql/util/tables/SQLHistoryCreateColumn.java +++ /dev/null @@ -1,138 +0,0 @@ -///******************************************************************************* -// * Copyright (c) 2013 hangum. -// * All rights reserved. This program and the accompanying materials -// * are made available under the terms of the GNU Lesser Public License v2.1 -// * which accompanies this distribution, and is available at -// * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -// * -// * Contributors: -// * hangum - initial API and implementation -// ******************************************************************************/ -//package com.hangum.tadpole.engine.sql.util.tables; -// -//import org.eclipse.jface.viewers.ColumnPixelData; -//import org.eclipse.jface.viewers.TableViewer; -//import org.eclipse.jface.viewers.TableViewerColumn; -//import org.eclipse.swt.SWT; -//import org.eclipse.swt.events.SelectionAdapter; -//import org.eclipse.swt.events.SelectionEvent; -//import org.eclipse.swt.widgets.TableColumn; -// -//import com.hangum.tadpole.engine.Messages; -// -// -///** -// * SQL history create column -// * -// * @author hangum -// * -// */ -//public class SQLHistoryCreateColumn { -// -// /** -// * history column -// * -// * @param tv -// * @param sorterHistory -// * @param layoutColumnLayout -// */ -// public static void createTableHistoryColumn(TableViewer tv, SQLHistorySorter sorterHistory, AutoResizeTableLayout layoutColumnLayout, boolean isQueryHistoryTrack) { -// // time -// TableViewerColumn tvcDate = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnDate = tvcDate.getColumn(); -// tblclmnDate.setWidth(150); -// tblclmnDate.setText(Messages.get().SQLHistoryCreateColumn_0); -// tblclmnDate.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnDate, 0)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(150)); -// -// // sql -// TableViewerColumn tvcSQL = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnSql = tvcSQL.getColumn(); -// tblclmnSql.setWidth(300); -// tblclmnSql.setText(Messages.get().SQLHistoryCreateColumn_1); -// tblclmnSql.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnSql, 1)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(300)); -// -// // duration -// TableViewerColumn tvcDuration = new TableViewerColumn(tv, SWT.RIGHT); -// TableColumn tblclmnDuration = tvcDuration.getColumn(); -// tblclmnDuration.setWidth(60); -// tblclmnDuration.setText(Messages.get().SQLHistoryCreateColumn_2); -// tblclmnDuration.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnDuration, 2)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(50)); -// -// // rows -// TableViewerColumn tvcRows = new TableViewerColumn(tv, SWT.RIGHT); -// TableColumn tblclmnRows = tvcRows.getColumn(); -// tblclmnRows.setWidth(60); -// tblclmnRows.setText(Messages.get().SQLHistoryCreateColumn_3); -// tblclmnRows.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnRows, 3)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(50)); -// -// // result -// TableViewerColumn tvcResult = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnResult = tvcResult.getColumn(); -// tblclmnResult.setWidth(90); -// tblclmnResult.setText(Messages.get().SQLHistoryCreateColumn_4); -// tblclmnResult.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnResult, 4)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(40)); -// -// TableViewerColumn tvcMessage = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnMessage = tvcMessage.getColumn(); -// tblclmnMessage.setWidth(250); -// tblclmnMessage.setText(Messages.get().SQLHistoryCreateColumn_5); -// tblclmnMessage.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnMessage, 5)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(80)); -// -// if (!isQueryHistoryTrack) { -// return; -// } -// -// // User name -// TableViewerColumn tvcUser = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnUser = tvcUser.getColumn(); -// tblclmnUser.setWidth(200); -// tblclmnUser.setText(Messages.get().SQLHistoryCreateColumn_6); -// tblclmnUser.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnUser, 6)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(150)); -// -// // Database -// TableViewerColumn tvcDatabase = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnDatabase = tvcDatabase.getColumn(); -// tblclmnDatabase.setWidth(250); -// tblclmnDatabase.setText(Messages.get().SQLHistoryCreateColumn_7); -// tblclmnDatabase.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnDatabase, 7)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(150)); -// -// // ip -// TableViewerColumn tvcIp = new TableViewerColumn(tv, SWT.NONE); -// TableColumn tblclmnIp = tvcIp.getColumn(); -// tblclmnIp.setWidth(250); -// tblclmnIp.setText(Messages.get().SQLHistoryCreateColumn_8); -// tblclmnIp.addSelectionListener(getSelectionAdapter(tv, sorterHistory, tblclmnIp, 8)); -// layoutColumnLayout.addColumnData(new ColumnPixelData(150)); -// } -// -// /** -// * tablecolumn adapter -// * @param viewer -// * @param comparator -// * @param column -// * @param index sort index -// * @return -// */ -// private static SelectionAdapter getSelectionAdapter(final TableViewer viewer, final DefaultViewerSorter comparator, final TableColumn column, final int index) { -// SelectionAdapter selectionAdapter = new SelectionAdapter() { -// @Override -// public void widgetSelected(SelectionEvent e) { -// comparator.setColumn(index); -// -// viewer.getTable().setSortDirection(comparator.getDirection()); -// viewer.getTable().setSortColumn(column); -// viewer.refresh(); -// } -// }; -// return selectionAdapter; -// } -// -//} diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/composite/ResultSetComposite.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/composite/ResultSetComposite.java index 8bb6637f1..c06eb61b4 100644 --- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/composite/ResultSetComposite.java +++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/composite/ResultSetComposite.java @@ -826,12 +826,7 @@ public class ResultSetComposite extends Composite { statement.setFetchSize(intSelectLimitCnt); if(DBGroupDefine.HIVE_GROUP != getUserDB().getDBGroup()) { statement.setQueryTimeout(queryTimeOut); - // - // setMaxRows 를 설정하면 SET SQL_SELECT_LIMIT=500 를 호출하게되고 그 후 풀텍스트 검색을하면 mysql 디비가 죽는다. - // - if(DBGroupDefine.MYSQL_GROUP != getUserDB().getDBGroup()) { - statement.setMaxRows(intSelectLimitCnt); - } + statement.setMaxRows(intSelectLimitCnt); } // check stop thread @@ -857,9 +852,7 @@ public class ResultSetComposite extends Composite { preparedStatement.setFetchSize(intSelectLimitCnt); if(DBGroupDefine.HIVE_GROUP != getUserDB().getDBGroup()) { preparedStatement.setQueryTimeout(queryTimeOut); - if(DBGroupDefine.MYSQL_GROUP != getUserDB().getDBGroup()) { - preparedStatement.setMaxRows(intSelectLimitCnt); - } + preparedStatement.setMaxRows(intSelectLimitCnt); } // check stop thread @@ -870,14 +863,14 @@ public class ResultSetComposite extends Composite { // execute query execServiceQuery = Executors.newSingleThreadExecutor(); -// if(intStartCnt == 0) { -// resultSet = _runSQLSelect(preparedStatement, reqQuery.getStatementParameter()); -// } else { + if(intStartCnt == 0) { + resultSet = _runSQLSelect(preparedStatement, reqQuery.getStatementParameter()); + } else { strSQL = PartQueryUtil.makeSelect(getUserDB(), strSQL, intStartCnt, intSelectLimitCnt); if(logger.isDebugEnabled()) logger.debug("part sql called : " + strSQL); - resultSet = _runSQLSelect(reqQuery, preparedStatement, reqQuery.getStatementParameter()); -// } + resultSet = _runSQLSelect(preparedStatement, reqQuery.getStatementParameter()); + } } queryResultDAO = new QueryExecuteResultDTO(getUserDB(), reqQuery.getSql(), true, resultSet, intSelectLimitCnt, intStartCnt); @@ -915,7 +908,7 @@ public class ResultSetComposite extends Composite { * @param statementParameter * @return */ - private ResultSet _runSQLSelect(final RequestQuery reqQuery, final PreparedStatement preparedStatement, final Object[] statementParameter) throws TadpoleException { + private ResultSet _runSQLSelect(final PreparedStatement preparedStatement, final Object[] statementParameter) throws TadpoleException { if(logger.isDebugEnabled()) logger.debug("======= wait for resultset prepared statement ......................................."); Future queryFuture = execServiceQuery.submit(new Callable() { diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/ManagerViewer.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/ManagerViewer.java index 249a0a7cc..fce101e83 100644 --- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/ManagerViewer.java +++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/ManagerViewer.java @@ -39,6 +39,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Tree; +import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPage; @@ -125,14 +126,14 @@ public class ManagerViewer extends ViewPart { // 리소스 가져온다. addManagerResouceData(userDB, false); -// if(userDB.is_isUseEnable()) { + if(userDB.is_isUseEnable()) { // 싱글 클릭일때 에디터에 오픈된 화면이 없으면 에디터 화면이 열리도록 수정. - // IEditorPart editor = EditorUtils.findSQLEditor(userDB); - // if(editor == null) { - // QueryEditorAction qea = new QueryEditorAction(); - // qea.run(userDB); - // } -// } + IEditorPart editor = EditorUtils.findSQLEditor(userDB); + if(editor == null) { + QueryEditorAction qea = new QueryEditorAction(); + qea.run(userDB); + } + } // Rice lock icode change event managerTV.refresh(userDB, true); -- 2.11.4.GIT