Skip to content

[Fix](ccr) Wrong result of tosql for show create table #45413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wyxxxcat wants to merge 1 commit into from
Closed

[Fix](ccr) Wrong result of tosql for show create table #45413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,7 @@ public String toSql(boolean isUniqueTable, boolean isCompatible) {
if (defaultValueExprDef != null) {
sb.append(" DEFAULT ").append(defaultValue).append("");
} else {
sb.append(" DEFAULT \"").append(defaultValue).append("\"");
sb.append(" DEFAULT \"").append(SqlUtils.escapeQuota(defaultValue)).append("\"");
}
}
if (getDataType() == PrimitiveType.BITMAP && defaultValue != null) {
Expand Down
14 changes: 13 additions & 1 deletion fe/fe-core/src/test/java/org/apache/doris/analysis/ShowCreateTableStmtTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@ protected void runBeforeAll() throws Exception {
createDatabase("test");
useDatabase("test");
createTable("create table table1\n"
+ "(k1 int comment 'test column k1', k2 int comment 'test column k2', `timestamp` DATE NOT NULL COMMENT '[''0000-01-01'', ''9999-12-31'']') comment 'test table1' "
+ "(`k1` int comment 'test column k1', "
+ "`k2` int comment 'test column k2', "
+ "`k3` varchar NOT NULL DEFAULT \"xxx\\\"xxx\\\"\", "
+ "`timestamp` DATE NOT NULL COMMENT '[''0000-01-01'', ''9999-12-31'']')\n"
+ "comment 'test table1'"
+ "PARTITION BY RANGE(`k1`)\n"
+ "(\n"
+ " PARTITION `p01` VALUES LESS THAN (\"10\"),\n"
Expand Down Expand Up @@ -62,6 +66,14 @@ public void testColumnComment() throws Exception {
Assertions.assertTrue(showSql.contains("`timestamp` date NOT NULL COMMENT \"['0000-01-01', '9999-12-31']\""));
}

@Test
public void testColumnDefault() throws Exception {
String sql = "show create table table1";
ShowResultSet showResultSet = showCreateTable(sql);
String showSql = showResultSet.getResultRows().get(0).get(1);
Assertions.assertTrue(showSql.contains("`k3` varchar(65533) NOT NULL DEFAULT \"xxx\\\"xxx\\\"\""));
}

@Test
public void testBrief() throws Exception {
String sql = "show brief create table table1";
Expand Down