Merge pull request #1098 from chat2db/dev

Dev

Author: shanhexi

chat2db-client/src/blocks/AppTitleBar/index.tsx

@@ -46,6 +46,10 @@ export default memo<IProps>((props) => {
     window.electronApi?.closeWindow();
   };
 
+  if(isMac === void 0){
+    return false
+  }
+
   return (
     <div className={classnames(styles.appTitleBar, className)} onDoubleClick={handleDoubleClick}>
       <div className={styles.appTitleBarGlobal}>

chat2db-client/src/components/SearchResult/hooks/useMultipleSelect.ts

@@ -32,7 +32,7 @@ const useMultipleSelect = (props: {
       if (event.keyCode === 16) {
         isShiftDownRef.current = true;
       }
-      if (event.keyCode === 91) {
+      if (event.keyCode === 91 || event.keyCode === 17) {
         isCmdDownRef.current = true;
       }
     };

chat2db-client/src/pages/main/index.less

@@ -37,6 +37,7 @@
   flex-shrink: 0;
   overflow: hidden;
   margin-bottom: 20px;
+  margin-top: 10px;
   cursor: pointer;
 }
 

chat2db-client/src/pages/main/index.tsx

@@ -188,7 +188,7 @@ function MainPage() {
   return (
     <div className={styles.page}>
       <div className={styles.layoutLeft}>
-        {/* {(isMac || isMac === void 0) && <BrandLogo size={40} className={styles.brandLogo} />} */}
+        {(isMac === void 0) && <BrandLogo size={38} className={styles.brandLogo} />}
         <ul className={styles.navList}>
           {navConfig.map((item) => {
             return (

chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManage.java

@@ -8,8 +8,6 @@
 import ai.chat2db.spi.sql.SQLExecutor;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.net.ssl.HostnameVerifier;
-
 public class ClickHouseDBManage extends DefaultDBManage implements DBManage {
 
     @Override
@@ -41,7 +39,7 @@ private String setDatabaseInJdbcUrl(ConnectInfo connectInfo) {
     @Override
     public void dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
         String sql = "DROP TABLE IF EXISTS " + databaseName + "." + tableName;
-        SQLExecutor.getInstance().executeSql(connection, sql, resultSet -> null);
+        SQLExecutor.getInstance().execute(connection, sql, resultSet -> null);
     }
 
 

chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/DB2DBManage.java

@@ -29,6 +29,6 @@ public void connectDatabase(Connection connection, String database) {
     @Override
     public void dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
         String sql = "DROP TABLE " + tableName;
-        SQLExecutor.getInstance().executeSql(connection,sql, resultSet -> null);
+        SQLExecutor.getInstance().execute(connection,sql, resultSet -> null);
     }
 }

chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/DB2MetaData.java

@@ -13,7 +13,6 @@
 import ai.chat2db.spi.MetaData;
 import ai.chat2db.spi.SqlBuilder;
 import ai.chat2db.spi.jdbc.DefaultMetaService;
-import ai.chat2db.spi.jdbc.DefaultSqlBuilder;
 import ai.chat2db.spi.model.Schema;
 import ai.chat2db.spi.model.TableIndex;
 import ai.chat2db.spi.model.TableIndexColumn;
@@ -63,14 +62,14 @@ public List<Schema> schemas(Connection connection, String databaseName) {
     @Override
     public String tableDDL(Connection connection, String databaseName, String schemaName, String tableName) {
         try {
-            SQLExecutor.getInstance().executeSql(connection, functionSQL.replace("tableSchema", schemaName), resultSet -> null);
+            SQLExecutor.getInstance().execute(connection, functionSQL.replace("tableSchema", schemaName), resultSet -> null);
         } catch (Exception e) {
             //log.error("创建函数失败", e);
         }
 
         String ddlSql = "SELECT " + schemaName + ".ufn_GetCreateTableScript('" + schemaName + "', '" + tableName
                 + "') AS sql";
-        return SQLExecutor.getInstance().executeSql(connection, ddlSql, resultSet -> {
+        return SQLExecutor.getInstance().execute(connection, ddlSql, resultSet -> {
             try {
                 if (resultSet.next()) {
                     return resultSet.getString("sql");

chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMDBManage.java

@@ -30,6 +30,6 @@ public void connectDatabase(Connection connection, String database) {
     @Override
     public void dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
         String sql = "DROP TABLE IF EXISTS " +tableName;
-        SQLExecutor.getInstance().executeSql(connection,sql, resultSet -> null);
+        SQLExecutor.getInstance().execute(connection,sql, resultSet -> null);
     }
 }

chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMMetaData.java

@@ -35,7 +35,7 @@ public String tableDDL(Connection connection, String databaseName, String schema
             "select dbms_metadata.get_ddl(%s, %s, %s) AS \"sql\" from dual",
             SqlUtils.formatSQLString("TABLE"), SqlUtils.formatSQLString(tableName),
             SqlUtils.formatSQLString(schemaName));
-        return SQLExecutor.getInstance().executeSql(connection, selectObjectDDLSQL, resultSet -> {
+        return SQLExecutor.getInstance().execute(connection, selectObjectDDLSQL, resultSet -> {
             try {
                 if (resultSet.next()) {
                     return resultSet.getString("sql");

chat2db-server/chat2db-plugins/chat2db-h2/src/main/java/ai/chat2db/plugin/h2/H2DBManage.java

@@ -31,6 +31,6 @@ public void connectDatabase(Connection connection, String database) {
     @Override
     public void dropTable(Connection connection, String databaseName, String schemaName, String tableName) {
         String sql = "DROP TABLE " +tableName;
-        SQLExecutor.getInstance().executeSql(connection,sql, resultSet -> null);
+        SQLExecutor.getInstance().execute(connection,sql, resultSet -> null);
     }
 }