From d3522afb8e504ed1ecd0c9234a23c6eee761ae4e Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Thu, 2 Dec 2021 11:41:29 +0800
Subject: [PATCH] [TS-783]<fix>: fixed coredump if table was created from
 normal table

---
 src/client/src/tscSQLParser.c                 |  5 +++
 .../pytest/table/create_db_from_normal_db.py  | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 tests/pytest/table/create_db_from_normal_db.py

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 0a4b7e9f78..a5a7936151 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7930,6 +7930,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   const char* msg3 = "tag value too long";
   const char* msg4 = "illegal value or data overflow";
   const char* msg5 = "tags number not matched";
+  const char* msg6 = "create table only from super table is allowed";
 
   SSqlCmd* pCmd = &pSql->cmd;
 
@@ -7977,6 +7978,10 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
       return code;
     }
 
+    if (UTIL_TABLE_IS_NORMAL_TABLE(pStableMetaInfo)) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
+    }
+
     size_t valSize = taosArrayGetSize(pValList);
 
     // too long tag values will return invalid sql, not be truncated automatically
diff --git a/tests/pytest/table/create_db_from_normal_db.py b/tests/pytest/table/create_db_from_normal_db.py
new file mode 100644
index 0000000000..9ceb2318c5
--- /dev/null
+++ b/tests/pytest/table/create_db_from_normal_db.py
@@ -0,0 +1,44 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        print("test case for TS-783")
+        tdSql.execute("drop table if exists db.state1;")
+        tdSql.execute("create table db.state1 (ts timestamp, c1 int);")
+        tdSql.error("create table db.test1 using db.state1 tags('tt');")
+
+        tdSql.execute("drop table if exists db.state2;")
+        tdSql.execute("create table db.state2 (ts timestamp, c1 int) tags (t binary(20));")
+        tdSql.query("create table db.test2 using db.state2 tags('tt');")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
-- 
GitLab