Merge branch 'devel' into CB-5833-fix-e-mails-recognition-for-sso

dbeaver · Nov 8, 2024 · 3109180 · 3109180
2 parents d82c36c + addeeb0
commit 3109180
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 5 deletions.
diff --git a/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls b/server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
@@ -86,6 +86,7 @@ type SQLResultColumn {
     precision: Int
 
     required: Boolean!
+    autoGenerated: Boolean!
 
     readOnly: Boolean!
     readOnlyStatus: String

diff --git a/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java b/...bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java
@@ -105,6 +105,11 @@ public boolean isRequired() {
         return attrMeta.isRequired();
     }
 
+    @Property
+    public boolean isAutoGenerated() {
+        return attrMeta.isAutoGenerated();
+    }
+
     @Property
     public boolean isReadOnly() {
         return DBExecUtils.isAttributeReadOnly(attrMeta);

diff --git a/webapp/packages/core-sdk/src/queries/grid/getSqlExecuteTaskResults.gql b/webapp/packages/core-sdk/src/queries/grid/getSqlExecuteTaskResults.gql
@@ -22,6 +22,7 @@ mutation getSqlExecuteTaskResults($taskId: ID!) {
           position
           precision
           required
+          autoGenerated
           readOnly
           readOnlyStatus
           scale

diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts
@@ -88,3 +88,4 @@ export * from './getProgressPercent.js';
 export * from './types/UndefinedToNull.js';
 export * from './bindFunctions.js';
 export * from './getDomainFromUrl.js';
+export * from './isNumber.js';
diff --git a/webapp/packages/core-utils/src/isNumber.ts b/webapp/packages/core-utils/src/isNumber.ts
@@ -0,0 +1,10 @@
+/*
+ * CloudBeaver - Cloud Database Manager
+ * Copyright (C) 2020-2024 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0.
+ * you may not use this file except in compliance with the License.
+ */
+export function isNumber(value: any): boolean {
+  return !isNaN(parseFloat(value)) && isFinite(value);
+}
diff --git a/webapp/packages/plugin-connection-search/src/locales/en.ts b/webapp/packages/plugin-connection-search/src/locales/en.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 export default [
-  ['plugin_connection_search_action_search_label', 'Find Local Database'],
+  ['plugin_connection_search_action_search_label', 'Find Database'],
   ['plugin_connection_search_settings_disable', 'Disable "{alias:plugin_connection_search_action_search_label}"'],
   ['plugin_connection_search_settings_disable_description', 'Disable the ability to search connections on a specific address'],
 ];
diff --git a/webapp/packages/plugin-connection-search/src/locales/fr.ts b/webapp/packages/plugin-connection-search/src/locales/fr.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 export default [
-  ['plugin_connection_search_action_search_label', 'Trouver une base de données locale'],
+  ['plugin_connection_search_action_search_label', 'Find Database'],
   ['plugin_connection_search_settings_disable', 'Disable "{alias:plugin_connection_search_action_search_label}"'],
   ['plugin_connection_search_settings_disable_description', 'Disable the ability to search connections on a specific address'],
 ];
diff --git a/webapp/packages/plugin-connection-search/src/locales/it.ts b/webapp/packages/plugin-connection-search/src/locales/it.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 export default [
-  ['plugin_connection_search_action_search_label', 'Find Local Database'],
+  ['plugin_connection_search_action_search_label', 'Find Database'],
   ['plugin_connection_search_settings_disable', 'Disable "{alias:plugin_connection_search_action_search_label}"'],
   ['plugin_connection_search_settings_disable_description', 'Disable the ability to search connections on a specific address'],
 ];
diff --git a/webapp/packages/plugin-connection-search/src/locales/ru.ts b/webapp/packages/plugin-connection-search/src/locales/ru.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 export default [
-  ['plugin_connection_search_action_search_label', 'Найти локальную базу данных'],
+  ['plugin_connection_search_action_search_label', 'Найти базу данных'],
   ['plugin_connection_search_settings_disable', 'Отключить "{alias:plugin_connection_search_action_search_label}"'],
   ['plugin_connection_search_settings_disable_description', 'Отключить возможность поиска подключений по заданному адресу'],
 ];
diff --git a/webapp/packages/plugin-connection-search/src/locales/zh.ts b/webapp/packages/plugin-connection-search/src/locales/zh.ts
@@ -6,7 +6,7 @@
  * you may not use this file except in compliance with the License.
  */
 export default [
-  ['plugin_connection_search_action_search_label', '查找本地数据库'],
+  ['plugin_connection_search_action_search_label', 'Find Database'],
   ['plugin_connection_search_settings_disable', 'Disable "{alias:plugin_connection_search_action_search_label}"'],
   ['plugin_connection_search_settings_disable_description', 'Disable the ability to search connections on a specific address'],
 ];