build: merge main into 422

.gitchangelog.rc

@@ -10,16 +10,16 @@
 ## of the regexps associated is matching.
 section_regexps = [
     ('New', [
-        r'^(PullRequest: ){1}([0-9])+( ){1}([fF]eat)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
+        r'^([fF]eat)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
      ]),
     ('Changes', [
-        r'^(PullRequest: ){1}([0-9])+( ){1}([cC]hore|[dD]oc|[rR]efactor)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
+        r'^([cC]hore|[dD]oc|[rR]efactor)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
      ]),
     ('Fix', [
-        r'^(PullRequest: ){1}([0-9])+( ){1}([fF]ix)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
+        r'^([fF]ix)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
      ]),
     ('Security', [
-        r'^(PullRequest: ){1}([0-9])+( ){1}([sS]ecurity|[sS]ecure)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
+        r'^([sS]ecurity|[sS]ecure)(\([a-zA-Z\-\s,]+\))?\s*:\s*.*$'
      ]),
     # Not generate other changes
     # ('Other', None ## Match all lines
@@ -75,16 +75,14 @@ body_process = ReSub(r'.*', r'') | strip
 ## be used in the changelog.
 ##
 ## Available constructs are those listed in ``body_process`` doc.
-## remove LinkE 'PullRequest: no.:' prefix
 subject_process = (strip |
-    ReSub(r'^(PullRequest: ){1}([0-9])+', r'') |
     ReSub(r'\r', r'') |
     SetIfEmpty("No commit message.") | ucfirst | final_dot)
 
 ## ``tag_filter_regexp`` is a regexp
 ## Tags that will be used for the changelog must match this regexp.
 # Match ODC release tag style
-tag_filter_regexp = r'^(release(_|-))?([0-9]+\.[0-9]+\.[0-9]+)((_|-)release)?(_|-)[0-9]+$'
+tag_filter_regexp = r'^v([0-9]+\.[0-9]+\.[0-9]+)$'
 
 ## ``revs`` is a list of callable or a list of string
 ##
@@ -98,7 +96,7 @@ tag_filter_regexp = r'^(release(_|-))?([0-9]+\.[0-9]+\.[0-9]+)((_|-)release)?(_|
 ##
 ## Using callables is especially useful, for instance, if you
 ## are using gitchangelog to generate incrementally your changelog.
-# ODC v2.0.0 start from tag_release_20191101
-revs = ["tag_release_20191101..HEAD"]
+# ODC v2.0.0 start from v4.2.0
+revs = ["v4.2.0..HEAD"]
 
 unreleased_version_label = "(unreleased)"

.github/pull_request_template.md

@@ -33,6 +33,13 @@ Fixes #
 
 #### Special notes for your reviewer:
 
+<!--
+This section is used to describe how this PR is implemented. 
+If this is a PR that fixes a bug, this section describes how the bug was fixed.
+If it's a new feature, this section briefly describes how to implement the new feature.
+etc.
+-->
+
 #### Additional documentation e.g., usage docs, etc.:
 
 <!--

.github/workflows/build_artifact.yaml

@@ -285,6 +285,7 @@ jobs:
           # security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
           # security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
           # echo "Cert Imported"
+          echo "node-linker=hoisted" >> .npmrc
           pnpm install
           # We need to create a new keychain, otherwise using the certificate will prompt
           # with a UI dialog asking for the certificate password, which we can't

.github/workflows/build_daily.yaml

@@ -329,6 +329,7 @@ jobs:
           # security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
           # security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
           # echo "Cert Imported"
+          echo "node-linker=hoisted" >> .npmrc
           pnpm install
           # We need to create a new keychain, otherwise using the certificate will prompt
           # with a UI dialog asking for the certificate password, which we can't

.github/workflows/build_release.yaml

@@ -281,6 +281,7 @@ jobs:
           # security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
           # security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
           # echo "Cert Imported"
+          echo "node-linker=hoisted" >> .npmrc
           pnpm install
           # We need to create a new keychain, otherwise using the certificate will prompt
           # with a UI dialog asking for the certificate password, which we can't

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "client"]
 	path = client
 	url = https://github.com/oceanbase/odc-client.git
-	branch = dev-4.2.1
+	branch = dev-4.2.2

.secignore

@@ -84,6 +84,22 @@
   http://xxx.xxx.xxx.xxx:xxxx*
   test@email.com
   https://tools.ietf.org*
+  https://obodc-front.oss-cn-beijing.aliyuncs.com/ODC*
+  https://discord.gg*
+  https://qr.dingtalk.com/action/joingroup*
+  https://help.github.com*
+  https://npmmirror.com*
+  https://www.contributor-covenant.org*
+  https://www.conventionalcommits*
+  https://plugins.jetbrains.com
+  *@oceanbase.com
+  https://www.jetbrains.com*
+  https://plugins.jetbrains.com*
+  http://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/oceanbase/odc*
+  http://pmd.sourceforge.net*
+  https://pmd.github.io*
+  http://ns.adobe.com*
+
 
 --------------------------------------------------------
 # Should use GLOB wildcard to configure and analysis the ignored folder

CHANGELOG-zh-CN.md

@@ -0,0 +1,45 @@
+# OceanBase Developer Center (ODC) CHANGELOG
+
+## 4.2.1 (2023-09-25)
+
+### 缺陷修复
+
+SQL 执行
+
+- OceanBase 4.0 之前版本时无法打印 DBMS 输出
+- 编辑结果集时 DML 语句生成速度缓慢
+
+导入导出
+
+- 任务执行过程中导入/导出对象在任务详情中不显示
+
+PL 调试
+
+- OceanBase 多节点部署时 PL 调试偶现无法连接到数据库
+- OceanBase Oracle 模式小写 schema 下调试匿名块时获取数据库连接错误
+
+数据源管理
+
+- 回收站模块生成的针对索引的 flashback 语句执行报错
+- 会话管理界面无法显示会话正在执行的 SQL
+- 批量导入连接时模版文件中存在空行或空列时引发空指针异常
+
+数据脱敏
+
+- OceanBase MySQL 模式配置为大小写敏感时，敏感列无法区分大小写
+
+工单管理
+
+- 工单提交后工单状态长期处于“排队中”不更新且工单不报错
+
+第三方集成
+
+- 审批流未包含外部审批节点时也会尝试获取外部审批工单的 ID
+
+SQL-Check
+
+- OceanBase Oracle 模式下无法检测表或列的注释是否存在
+
+### 安全加固
+
+- 解决第三方集成过程中可能发生的 SSRF 攻击