Skip to content

Commit

Permalink
Merge pull request #411 from hangum/1.3.3
Browse files Browse the repository at this point in the history 
1.3.3
  • Loading branch information
@hangum
hangum committed Apr 7, 2014
2 parents 9b7384e + 741cee9 commit c5842d5
Show file tree
Hide file tree
Showing 20 changed files with 183 additions and 81 deletions.
2 changes: 1 addition & 1 deletion com.hangum.tadpole.application/plugin.xml
View file
Expand Up @@ -26,7 +26,7 @@
favicon="icons/old_TadpoleDBHub.ico"
id="com.hangum.tadpole.browser.rap.branding"
themeId="org.eclipse.rap.design.example.business.theme"
title="Tadpole DB Hub - v1.3.2(Edge)-R1">
title="Tadpole DB Hub - v1.3.3(Edge)-R1">
</branding>
</extension>
<extension
Expand Down
6 changes: 3 additions & 3 deletions ...um.tadpole.commons.libs/src/com/hangum/tadpold/commons/libs/core/define/SystemDefine.java
View file
Expand Up @@ -19,9 +19,9 @@
public class SystemDefine {

public static final String NAME = "Tadpole DB Hub";
public static final String MAJOR_VERSION = "1.3.2 (edge)";
public static final String SUB_VERSION = "Build " + "(R0)";
public static final String RELEASE_DATE = "2014.04.01";
public static final String MAJOR_VERSION = "1.3.3 (edge)";
public static final String SUB_VERSION = "Build " + "(R1)";
public static final String RELEASE_DATE = "2014.04.07";
public static final String INFORMATION = "https://github.com/hangum/TadpoleForDBTools/wiki";

public static final String ADMIN_EMAIL = "adi.tadpole@gmail.com";
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/CUBRIDConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="cubrid.jdbc.driver.CUBRIDDriver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/MSSQLConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="net.sourceforge.jtds.jdbc.Driver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/MSSQLConfig_8_LE.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="net.sourceforge.jtds.jdbc.Driver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/MariaDBConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="org.mariadb.jdbc.Driver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/MySQLConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="com.mysql.jdbc.Driver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/OracleConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="oracle.jdbc.driver.OracleDriver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/POSTGREConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="org.postgresql.Driver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/config/TAJOConfig.xml
View file
Expand Up @@ -18,7 +18,7 @@
<properties resource="com/hangum/tadpole/engine/config/commons/setting.propertis"/>

<transactionManager type="JDBC">
<dataSource type="SIMPLE">
<dataSource type="DBCP">
<property name="JDBC.Driver" value="org.apache.tajo.jdbc.TajoDriver" />
<property name="JDBC.ConnectionURL" value="${JDBC.ConnectionURL}" />
<property name="JDBC.Username" value="${JDBC.Username}" />
Expand Down
4 changes: 2 additions & 2 deletions ...um.tadpole.commons.sql/src/com/hangum/tadpole/sql/preference/define/PreferenceDefine.java
View file
Expand Up @@ -39,9 +39,9 @@ public class PreferenceDefine {
/** select 제한 갯수 */
public static final String SELECT_LIMIT_COUNT = "SELECT_LIMIT_COUNT";
/** select 디폴트 값 */
public static final int SELECT_SELECT_LIMIT_COUNT_VALUE = 1000;
public static final int SELECT_SELECT_LIMIT_COUNT_VALUE = 200;
/** 한번에 select 할수 있는 최대 값 */
public static final int SELECT_SELECT_LIMIT_COUNT_MAX_PREFERENCE_VALUE = 1000;
public static final int SELECT_SELECT_LIMIT_COUNT_MAX_PREFERENCE_VALUE = 200;

/** 검색 결과 페이지 당 보여주는 갯수 */
public static final String SELECT_RESULT_PAGE_PREFERENCE = "SELECT_RESULT_PAGE_PREFERENCE";
Expand Down
2 changes: 1 addition & 1 deletion ...um.tadpole.hive.core/src_test/com/hangum/tadpole/hive/core/connection/HiveJdbcClient.java
View file
Expand Up @@ -25,7 +25,7 @@ public static void main(String[] args) throws SQLException {

try {
System.out.println("===Connection start===========================================");
Connection con = DriverManager.getConnection("jdbc:hive://192.168.56.101:10000/default", "", "");
Connection con = DriverManager.getConnection("jdbc:hive://127.0.0.1:10000/default", "", "");
System.out.println("===Connection send===========================================");

Statement stmt = con.createStatement();
Expand Down
4 changes: 2 additions & 2 deletions ...m.tadpole.hive.core/src_test/com/hangum/tadpole/hive/core/connection/HiveJdbcClient2.java
View file
Expand Up @@ -25,10 +25,10 @@ public static void main(String[] args) throws SQLException {
System.out.println("loaded hive driver...");

//replace "hive" here with the name of the user the queries should run as
Connection con = DriverManager.getConnection("jdbc:hive2://192.168.56.101:10000/sbx", "hangum", "duroah");
Connection con = DriverManager.getConnection("jdbc:hive2://127.0.0.1:10002/default", "hangum", "xxxx");
Statement stmt = con.createStatement();

stmt.execute("use sbx");
// stmt.execute("use sbx");

String tableName = "testhangum";
stmt.execute("drop table if exists " + tableName);
Expand Down
5 changes: 3 additions & 2 deletions com.hangum.tadpole.preference/src/com/hangum/tadpole/preference/ui/RDBPreferencePage.java
View file
Expand Up @@ -122,7 +122,7 @@ public void widgetSelected(SelectionEvent e) {
btnCreatePlanTable.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
TadpoleSimpleMessageDialog planDialog = new TadpoleSimpleMessageDialog(getShell(), textOraclePlan.getText(), planTable);
TadpoleSimpleMessageDialog planDialog = new TadpoleSimpleMessageDialog(getShell(), textOraclePlan.getText(), ORACLE_PLAN_TABLE);
planDialog.open();
}
});
Expand Down Expand Up @@ -226,7 +226,8 @@ private void initDefaultValue() {
lblUserFont.setText(strFontInfo);
}

public static String planTable =
/** ORACLE PLAN TABLE */
private static final String ORACLE_PLAN_TABLE =
" CREATE TABLE plan_table ( \r\n" +
" STATEMENT_ID VARCHAR2(30), \r\n" +
" plan_id NUMBER, \r\n" +
Expand Down
1 change: 1 addition & 0 deletions ...b.core/src/com/hangum/tadpole/rdb/core/dialog/dbconnect/composite/HiveLoginComposite.java
View file
Expand Up @@ -112,6 +112,7 @@ public void crateComposite() {
comboDriverType.setData("Hive Server 2", DBDefine.HIVE2_DEFAULT);

comboDriverType.select(1);
comboDriverType.setEnabled(false);

Label lblHost = new Label(grpConnectionType, SWT.NONE);
lblHost.setText(Messages.DBLoginDialog_1);
Expand Down
2 changes: 1 addition & 1 deletion com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditor.java
View file
Expand Up @@ -152,7 +152,7 @@ public void createPartControl(Composite parent) {
tltmConnectURL.setImage(ResourceManager.getPluginImage(Activator.PLUGIN_ID, "resources/icons/editor/connect.png")); //$NON-NLS-1$

if(PermissionChecker.isShow(SessionManager.getRepresentRole())) {
if(DBDefine.getDBDefine(userDB) == DBDefine.SQLite_DEFAULT ) {
if(userDB.getDBDefine() == DBDefine.SQLite_DEFAULT ) {
String fileName = new File(userDB.getDb()).getName();
tltmConnectURL.setText(String.format(userDB.getDbms_types() + " - %s", fileName));
} else {
Expand Down
6 changes: 5 additions & 1 deletion ....rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/composite/ResultMainComposite.java
View file
Expand Up @@ -144,12 +144,13 @@ public void setMainEditor(MainEditor mainEditor) {
* @param reqQuery
*/
public void executeCommand(final RequestQuery reqQuery) {
logger.debug("==> executeQuery start " + reqQuery);

// 쿼리를 이미 실행 중이라면 무시합니다.
if(compositeResultSet.getJobQueryManager() != null) {
logger.debug("===> job state is : " + compositeResultSet.getJobQueryManager().getState());
if(Job.RUNNING == compositeResultSet.getJobQueryManager().getState()) {
logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");logger.debug("================= return running job ");
logger.debug("================= return running query job ");
return;
}
}
Expand All @@ -175,6 +176,9 @@ public void executeCommand(final RequestQuery reqQuery) {
if(isDMLQuestion) if(!MessageDialog.openConfirm(null, "Confirm", Messages.MainEditor_56)) return; //$NON-NLS-1$
}

// tab을 처음으로 이동합니다.
resultFolderSel(EditorDefine.RESULT_TAB.RESULT_SET);

// 실제 쿼리 실행.
compositeResultSet.executeCommand(reqQuery);
}
Expand Down

0 comments on commit c5842d5

Please sign in to comment.