diff --git a/nginx.conf b/nginx.conf index a82019a527e4e747f8b3622a8676fa91ee003aaf..bbbb7e08e8da73ece4b9554ebd19dbd52edf5d72 100644 --- a/nginx.conf +++ b/nginx.conf @@ -42,9 +42,14 @@ http { proxy_ignore_client_abort on; server { listen 80; + # server_name docs.mogdb.io; charset utf-8; root /usr/share/nginx/html/; index index.html; + error_page 404 /404; + location / { + try_files $uri $uri/ =404; + } } include /etc/nginx/conf.d/*.conf; } diff --git a/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md b/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md index 81e8a23b81aaa1d25662a01e250479abacbd95df..10f445e2a584bab9a8f3b86f99769f20a22f8ed3 100644 --- a/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md +++ b/product/en/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md @@ -42,7 +42,7 @@ Check all schemas: Check functions where some functions include parameters and some functions do not include parameters. The parameter type is boolean. ```sql -\df +\df dbms_output.* ``` Example of functions that do not include parameters: diff --git a/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md b/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md index 45338f13b9cecbf00cd32f35220c8de2693a7c93..f7475b4afacb79493422fd2244c8bec830703a3e 100644 --- a/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md +++ b/product/en/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md @@ -86,7 +86,7 @@ DROP VIEW IF EXISTS test_view; DROP TABLE IF EXISTS table1; ``` -### DELETE VEW +### DELETE VIEW ```sql CREATE TABLE IF NOT EXISTS table1(id int, a char(6), b varchar(6), c varchar(6)); diff --git a/product/en/docs-mtk/v2.0/release-notes.md b/product/en/docs-mtk/v2.0/release-notes.md index c7a4bdc5e0e4d5c8073acc3706031e244bcd9151..bb72f4a29e43f399787bcc6e827cb15986aa3dbe 100644 --- a/product/en/docs-mtk/v2.0/release-notes.md +++ b/product/en/docs-mtk/v2.0/release-notes.md @@ -7,19 +7,47 @@ date: 2021-09-13 # Release Notes +## v2.2.2 + +2022-03-01 + +- [mtk_2.2.2_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64.tar.gz) +- [mtk_2.2.2_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64_db2.tar.gz) +- [mtk_2.2.2_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_arm64.tar.gz) +- [mtk_2.2.2_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64.tar.gz) +- [mtk_2.2.2_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64_db2.tar.gz) +- [mtk_2.2.2_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_arm64.tar.gz) +- [mtk_2.2.2_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64.tar.gz) +- [mtk_2.2.2_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64_db2.tar.gz) +- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_checksums.txt) + +### Feat + +- Added check if the `orafce` plugin is installed and skips some syntax conversions +- Disables `connect by` syntax conversion for MogDB 2.1.0 +- Optimized the migration of Oracle to openGauss/MogDB constraint renaming logic +- Added Oracle table data character set check + +### Fix + +- Code smell and security issues +- Migration of Oracle to MySQL section issue +- Migrated Some Syntax Conversion Issues from Oracle to MogDB 2.1.0 +- DB2 clob length issue + ## v2.2.1 2022-01-20 -- [mtk_2.2.1_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_darwin_amd64.tar.gz) -- [mtk_2.2.1_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_darwin_amd64_db2.tar.gz) -- [mtk_2.2.1_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_darwin_arm64.tar.gz) -- [mtk_2.2.1_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_linux_amd64.tar.gz) -- [mtk_2.2.1_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_linux_amd64_db2.tar.gz) -- [mtk_2.2.1_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_linux_arm64.tar.gz) -- [mtk_2.2.1_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_windows_amd64.tar.gz) -- [mtk_2.2.1_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_2.2.1_windows_amd64_db2.tar.gz) -- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com//mtk/v2.2.1/mtk_checksums.txt) +- [mtk_2.2.1_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_darwin_amd64.tar.gz) +- [mtk_2.2.1_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_darwin_amd64_db2.tar.gz) +- [mtk_2.2.1_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_darwin_arm64.tar.gz) +- [mtk_2.2.1_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_linux_amd64.tar.gz) +- [mtk_2.2.1_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_linux_amd64_db2.tar.gz) +- [mtk_2.2.1_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_linux_arm64.tar.gz) +- [mtk_2.2.1_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_windows_amd64.tar.gz) +- [mtk_2.2.1_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_2.2.1_windows_amd64_db2.tar.gz) +- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com/mtk/v2.2.1/mtk_checksums.txt) ### Feat diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md b/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md index 61f471af4c9af6de7d2b21de520f204b99f944f9..29649bca2429edda1886b350639db96b70886fee 100644 --- a/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md +++ b/product/zh/docs-mogdb/v2.1/reference-guide/oracle-plugins/orafce-user-guide.md @@ -42,7 +42,7 @@ create extension orafce; 检查函数,其中函数分为有参数、无参数,参数类型为boolean。 ```sql -\df +\df dbms_output.* ``` 无参: diff --git a/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md b/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md index 741e909d9811bbb60b51b65fd48fbefe60bb91bb..43fddeaa038f1a3d71b47751880957f0b684e4b7 100644 --- a/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md +++ b/product/zh/docs-mogdb/v2.1/reference-guide/system-catalogs-and-system-views/overview-of-system-catalogs-and-system-views.md @@ -95,7 +95,7 @@ DROP VIEW IF EXISTS test_view; DROP TABLE IF EXISTS table1; ``` -### DELETE VEW +### DELETE VIEW ```sql CREATE TABLE IF NOT EXISTS table1(id int, a char(6), b varchar(6), c varchar(6)); diff --git a/product/zh/docs-mtk/v2.0/release-notes.md b/product/zh/docs-mtk/v2.0/release-notes.md index 88aa0dba14be8069732fbe2bdc318e8379bb35a2..620b9e1d671ab4327489a60959c9ca2dbc618950 100644 --- a/product/zh/docs-mtk/v2.0/release-notes.md +++ b/product/zh/docs-mtk/v2.0/release-notes.md @@ -7,6 +7,34 @@ date: 2021-09-17 # 发布记录 +## v2.2.2 + +2022-03-01 + +- [mtk_2.2.2_darwin_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64.tar.gz) +- [mtk_2.2.2_darwin_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_amd64_db2.tar.gz) +- [mtk_2.2.2_darwin_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_darwin_arm64.tar.gz) +- [mtk_2.2.2_linux_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64.tar.gz) +- [mtk_2.2.2_linux_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_amd64_db2.tar.gz) +- [mtk_2.2.2_linux_arm64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_linux_arm64.tar.gz) +- [mtk_2.2.2_windows_amd64.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64.tar.gz) +- [mtk_2.2.2_windows_amd64_db2.tar.gz](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_2.2.2_windows_amd64_db2.tar.gz) +- [mtk_checksums.txt](https://cdn-mogdb.enmotech.com/mtk/v2.2.2/mtk_checksums.txt) + +### Feat + +- 增加检查orafce插件是否安装并跳过部分语法转换 +- 针对MogDB 2.1.0 禁用`connect by`语法转换 +- 优化迁移Oracle到openGauss/MogDB 约束改名逻辑 +- 增加Oracle表数据字符集检查 + +### Fix + +- 代码异味和安全问题 +- 迁移 Oracle 到 MySQL 部分问题 +- 迁移 Oracle to MogDB 2.1.0 部分语法转换问题 +- DB2 clob 长度问题 + ## v2.2.1 2022-01-20 diff --git a/scripts/build_pdf.sh b/scripts/build_pdf.sh index f9295f6c9d5d2426aac46b5fe5fa364e36cd4995..187a5a314c53c3d75b648078b0390ed63b099aa6 100755 --- a/scripts/build_pdf.sh +++ b/scripts/build_pdf.sh @@ -36,6 +36,8 @@ only_build_mogdb=no # 只 构建 mogha~ 文档 only_build_mogha=no +# 只 构建 mogha~ 文档 +only_build_manager=no function h1() { @@ -223,6 +225,32 @@ function generate_mtk_pdf() { done } +managerDocsVersions=("v1.0") + + +declare -A managerZnTitle=( \ + ["toc"]="MogDB-Manager-指南" \ +) + +declare -A managerEnTitle=( \ + ["toc"]="MogDB-Manager-Reference" \ +) + +function generate_manager_pdf() { + for(( i=0;i<${#mogdbDocsLanguages[@]};i++)) + do + language=${mogdbDocsLanguages[i]} + for(( j=0;j<${#managerDocsVersions[@]};j++)) + do + version=${managerDocsVersions[j]} + if [[ "$language" == "zh" ]]; then + _generate_docs_pdf "docs-manager" $language $version managerZnTitle + elif [[ "$language" == "en" ]]; then + _generate_docs_pdf "docs-manager" $language $version managerEnTitle + fi + done + done +} scaDocsVersions=("v4.0" "v4.1") declare -A scaZnTitle=( \ @@ -360,6 +388,7 @@ function _usage() --mvd build mvd docs pdf --mtk build mtk docs pdf --mogha build mogha docs pdf + --manager build manager docs pdf --nobuild not build pdf --tex build tex file -u | --upload upload build pdf to oss @@ -376,7 +405,7 @@ Optnum=$# # NOTE: This requires GNU getopt. On Mac OS X and FreeBSD, you have to install this # separately; see below. -TEMP=$(getopt -o h,u --long help,mtk,sca,mvd,nobuild,mogha,mogdb,upload,tex \ +TEMP=$(getopt -o h,u --long help,mtk,sca,mvd,nobuild,mogha,mogdb,manager,upload,tex \ -n 'buld_pdf' -- "$@") if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi @@ -394,6 +423,7 @@ while true; do --mvd ) build_all=no;only_build_mvd=yes; shift ;; --mogha ) build_all=no;only_build_mogha=yes;shift ;; --mogdb ) build_all=no;only_build_mogdb=yes;shift ;; + --manager ) build_all=no;only_build_manager=yes;shift ;; --tex ) build_tex=yes;shift ;; * ) break ;; esac @@ -429,6 +459,11 @@ if [[ ${nobuild} != "no" ]]; then h1 "Build MogDB " generate_mogdb_pdf fi + # build mogdb pdf + if [[ "${build_all}" == "yes" ]] || [[ "${only_build_manager}" == "yes" ]]; then + h1 "Build MogDB Manager" + generate_manager_pdf + fi fi diff --git a/scripts/gitee_build_pr.sh b/scripts/gitee_build_pr.sh index 53866523fd98494a9706d8a8f0a1b62d6bff58d9..96478eca6548794fdaee4c5d23a17429d6da07ba 100755 --- a/scripts/gitee_build_pr.sh +++ b/scripts/gitee_build_pr.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# export giteePullRequestIid=12 +# export BUILD_DIR=/data/pr +# export giteeSourceBranch=docs-develop + set -e conName="pr_"${giteePullRequestIid} @@ -37,7 +41,7 @@ if [[ ${retCode} != 0 ]]; then exit 1 fi -yarn build +yarn build --verbose # npm run build retCode=$? if [[ ${retCode} != 0 ]]; then @@ -54,7 +58,7 @@ if [ -f ${pr_port_file} ];then else for port in {9001..10000}; do - if [ ` lsof -i:${port} | wc -l` -eq 0 ]; then + if [ `netstat -apn |grep ${port} | wc -l` -eq 0 ]; then pr_port=${port} break fi @@ -66,10 +70,14 @@ if [ ! -n "${pr_port}" ]; then exit 1 fi +cp nginx.conf ${dir}/nginx.conf +sed -i "s/listen 80;/listen ${pr_port};/g" ${dir}/nginx.conf +sed -i "s/# server_name docs.mogdb.io;/server_name docs.mogdb.io;/g" ${dir}/nginx.conf + docker run -d \ - -v `pwd`/nginx.conf:/etc/nginx/nginx.conf \ + -v ${dir}/nginx.conf:/etc/nginx/nginx.conf \ -v ${publicDir}:/usr/share/nginx/html \ - -p ${pr_port}:80 \ + -p ${pr_port}:${pr_port} \ --name ${conName} \ nginx