Merge pull request #24135 from taosdata/fix/merge_to_main

other: merge to main
taosdata · Dec 19, 2023 · f9363e7 · f9363e7
2 parents ac3ace4 + ecab665
commit f9363e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:latest
 
 WORKDIR /root
 

diff --git a/tests/system-test/1-insert/db_tb_name_check.py b/tests/system-test/1-insert/db_tb_name_check.py
@@ -76,7 +76,8 @@ def tb_name_check(self):
             new_tbname = ''.join(tbname1)
             for sql in [f'`{dbname}`.`{new_tbname}`',f'`{new_tbname}`']:
                 tdSql.error(f'create table {sql} (ts timestamp,c0 int)')
-        tdSql.execute(f'drop database `{dbname}`')            
+        tdSql.execute(f'trim database `{dbname}`')
+        tdSql.execute(f'drop database `{dbname}`')
     def run(self):
         self.db_name_check()
         self.tb_name_check()