From b82a1c71be377a07c2458288a3e92a18f3ec918f Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 3 Mar 2021 10:02:07 +0800
Subject: [PATCH] add count and select tbname SQL test in springbootdemo

---
 .../controller/WeatherController.java         | 10 ++++++++
 .../springbootdemo/dao/WeatherMapper.java     |  6 ++++-
 .../springbootdemo/dao/WeatherMapper.xml      | 25 ++++++++++++-------
 .../service/WeatherService.java               |  8 ++++++
 .../src/main/resources/application.properties | 13 ++++++----
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
index 4a4109dcf3..1ce3de4948 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/controller/WeatherController.java
@@ -59,4 +59,14 @@ public class WeatherController {
         return weatherService.save(weatherList);
     }
 
+    @GetMapping("/count")
+    public int count() {
+        return weatherService.count();
+    }
+
+    @GetMapping("/subTables")
+    public List<String> getSubTables() {
+        return weatherService.getSubTables();
+    }
+
 }
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
index cae1a1aec0..8687e66772 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.java
@@ -11,9 +11,13 @@ public interface WeatherMapper {
 
     int batchInsert(List<Weather> weatherList);
 
-    List<Weather> select(@Param("limit") Long limit, @Param("offset")Long offset);
+    List<Weather> select(@Param("limit") Long limit, @Param("offset") Long offset);
 
     void createDB();
 
     void createTable();
+
+    int count();
+
+    List<String> getSubTables();
 }
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
index a9bcda0b00..ffdabf9a35 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/dao/WeatherMapper.xml
@@ -4,16 +4,16 @@
 <mapper namespace="com.taosdata.example.springbootdemo.dao.WeatherMapper">
 
     <resultMap id="BaseResultMap" type="com.taosdata.example.springbootdemo.domain.Weather">
-        <id column="ts" jdbcType="TIMESTAMP" property="ts" />
-        <result column="temperature" jdbcType="INTEGER" property="temperature" />
-        <result column="humidity" jdbcType="FLOAT" property="humidity" />
+        <id column="ts" jdbcType="TIMESTAMP" property="ts"/>
+        <result column="temperature" jdbcType="INTEGER" property="temperature"/>
+        <result column="humidity" jdbcType="FLOAT" property="humidity"/>
     </resultMap>
 
-    <update id="createDB" >
+    <update id="createDB">
         create database if not exists test;
     </update>
 
-    <update id="createTable" >
+    <update id="createTable">
         create table if not exists test.weather(ts timestamp, temperature int, humidity float);
     </update>
 
@@ -23,7 +23,7 @@
 
     <select id="select" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from test.weather
         order by ts desc
         <if test="limit != null">
@@ -34,16 +34,23 @@
         </if>
     </select>
 
-    <insert id="insert" parameterType="com.taosdata.example.springbootdemo.domain.Weather" >
+    <insert id="insert" parameterType="com.taosdata.example.springbootdemo.domain.Weather">
         insert into test.weather (ts, temperature, humidity) values (now, #{temperature,jdbcType=INTEGER}, #{humidity,jdbcType=FLOAT})
     </insert>
 
-    <insert id="batchInsert" parameterType="java.util.List" >
+    <insert id="batchInsert" parameterType="java.util.List">
         insert into test.weather (ts, temperature, humidity) values
-        <foreach separator=" " collection="list" item="weather" index="index" >
+        <foreach separator=" " collection="list" item="weather" index="index">
             (now + #{index}a, #{weather.temperature}, #{weather.humidity})
         </foreach>
     </insert>
 
+    <select id="getSubTables">
+        select tbname from test.weather
+    </select>
+
+    <select id="count">
+        select count(*) from test.weather;
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
index 31ce8f1dd9..2f3bc78991 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
+++ b/tests/examples/JDBC/springbootdemo/src/main/java/com/taosdata/example/springbootdemo/service/WeatherService.java
@@ -35,4 +35,12 @@ public class WeatherService {
         return weatherMapper.batchInsert(weatherList);
     }
 
+    public int count() {
+        return weatherMapper.count();
+    }
+
+    public List<String> getSubTables() {
+        return weatherMapper.getSubTables();
+    }
+
 }
diff --git a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
index 4fb68758c4..594a1fa4d0 100644
--- a/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
+++ b/tests/examples/JDBC/springbootdemo/src/main/resources/application.properties
@@ -1,12 +1,15 @@
 # datasource config - JDBC-JNI
-spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
-spring.datasource.url=jdbc:TAOS://127.0.0.1:6030/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+#spring.datasource.driver-class-name=com.taosdata.jdbc.TSDBDriver
+#spring.datasource.url=jdbc:TAOS://127.0.0.1:6030/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=taosdata
+
+# datasource config - JDBC-RESTful
+spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
+spring.datasource.url=jdbc:TAOS-RS://master:6041/test?timezone=UTC-8&charset=UTF-8&locale=en_US.UTF-8
 spring.datasource.username=root
 spring.datasource.password=taosdata
 
-# datasource config - JDBC-RESTful
-#spring.datasource.driver-class-name=com.taosdata.jdbc.rs.RestfulDriver
-#spring.datasource.url=jdbc:TAOS-RS://master:6041/test?user=root&password=taosdata
 
 spring.datasource.druid.initial-size=5
 spring.datasource.druid.min-idle=5
-- 
GitLab