From 415bb8ef78b561ad5ba5b88dacdd69014adda895 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Tue, 6 Jun 2023 18:15:44 +0000 Subject: [PATCH 1/2] fix: upgrade com.alibaba:druid from 1.2.17 to 1.2.18 Snyk has created this PR to upgrade com.alibaba:druid from 1.2.17 to 1.2.18. See this package in Maven Repository: https://mvnrepository.com/artifact/com.alibaba/druid/ See this project in Snyk: https://app.snyk.io/org/z2z2qp/project/e0cf6b8b-62c9-4791-9b14-bfe183b2fc5b?utm_source=github&utm_medium=referral&page=upgrade-pr --- mybatis-flex-spring-boot-starter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index 28affc54..5f56b483 100644 --- a/mybatis-flex-spring-boot-starter/pom.xml +++ b/mybatis-flex-spring-boot-starter/pom.xml @@ -68,7 +68,7 @@ com.alibaba druid - 1.2.17 + 1.2.18 compile true From 6e1a30fb8e88067fd27f41917554b6821dedfb38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E4=BD=B3=E5=BD=AC?= Date: Wed, 7 Jun 2023 09:53:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AAQueryTa?= =?UTF-8?q?ble=EF=BC=8C=E5=8F=82=E6=95=B0=E7=9A=84=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mybatisflex/core/query/QueryColumn.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java index 708157e4..ec528cdf 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java @@ -54,6 +54,12 @@ public class QueryColumn implements Serializable { this.name = name; } + public QueryColumn(QueryTable queryTable, String name) { + SqlUtil.keepColumnSafely(name); + this.table = queryTable; + this.name = name; + } + public QueryTable getTable() { return table;