This is an automated email from the ASF dual-hosted git repository.
brahma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 31112b655f AMBARI-25817 : Fix DDLTests.testVerifyMySQL and
DDLTests.testCompareMySQL Ambari test failures (#3614)
31112b655f is described below
commit 31112b655fdf4b36725ecc552918f418242f9b4a
Author: Himanshu Maurya <54660538+himanshumaurya09...@users.noreply.github.com>
AuthorDate: Mon Dec 26 23:18:18 2022 +0530
AMBARI-25817 : Fix DDLTests.testVerifyMySQL and DDLTests.testCompareMySQL
Ambari test failures (#3614)
Signed-off-by: Brahma Reddy Battula <bra...@apache.org>
---
.../src/test/java/org/apache/ambari/server/orm/db/DDLTestUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTestUtils.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTestUtils.java
index cc4d6ba28a..332d5e0cc3 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTestUtils.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/db/DDLTestUtils.java
@@ -79,7 +79,7 @@ public class DDLTestUtils {
// These patterns are used to match column/constraint definitons in a create
table statement
// to capture the table name
- private static final Pattern TableName = Pattern.compile("^\\s*create
table\\s+([\\w\\.\\_]+).*$");
+ private static final Pattern TableName = Pattern.compile("^\\s*create
table\\s+([\\`\\w\\.\\_\\`]+).*$");
// to capture the name and columns in a primary key
private static final Pattern PK =
Pattern.compile("^.*constraint\\s+([\\w\\.\\_]+)\\s+primary\\s+key\\s*\\(([^\\)]+)\\).*$");
// to capture the name and columns in a clusterd primary key
@@ -87,7 +87,7 @@ public class DDLTestUtils {
// to capture the name and columns in a unique constraint
private static final Pattern UQ =
Pattern.compile("^.*constraint\\s+([\\w\\.\\_]+)\\s+unique\\s*\\(([^\\)]+)\\).*$");
// to capture the name and columns and the referred columnd in a foreign key
- private static final Pattern FK =
Pattern.compile("^.*constraint\\s+([\\w\\.\\_]+)\\s+foreign\\s+key\\s*\\(([^\\)]*)\\)\\s*references\\s+([\\w\\_\\.]+)\\s*\\(([^\\)]+)\\).*$");
+ private static final Pattern FK =
Pattern.compile("^.*constraint\\s+([\\w\\.\\_]+)\\s+foreign\\s+key\\s*\\(([^\\)]*)\\)\\s*references\\s+([\\`\\w\\_\\.\\`]+)\\s*\\(([^\\)]+)\\).*$");
// to capture the name of a columns
private static final Pattern Col =
Pattern.compile("^\\s*([\\`\\\"\\[\\]\\w\\.\\_]+)\\s+.*$");
// to capture column lists within the create table statement, such as the
column list in "primary key (name, id)"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ambari.apache.org
For additional commands, e-mail: commits-h...@ambari.apache.org
