From c1d4faed3e05a2f36febde272cfad577e9e52291 Mon Sep 17 00:00:00 2001
From: tristaZero <hannkenn@163.com>
Date: Mon, 28 Jan 2019 16:25:06 +0800
Subject: [PATCH] modify select.xml

---
 .../src/test/resources/parser/select.xml      | 102 +++++++++---------
 .../resources/parser/select_aggregate.xml     |  24 ++---
 .../resources/parser/select_expression.xml    |   6 +-
 .../test/resources/parser/select_group_by.xml |  28 ++---
 .../src/test/resources/parser/select_or.xml   |  18 ++--
 .../test/resources/parser/select_order_by.xml |  36 +++----
 .../resources/parser/select_pagination.xml    |  42 ++++----
 .../select_pagination_group_by_order_by.xml   |  32 +++---
 .../test/resources/parser/select_relation.xml |  20 ++--
 .../resources/parser/select_sub_query.xml     |  10 +-
 10 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/sharding-core/src/test/resources/parser/select.xml b/sharding-core/src/test/resources/parser/select.xml
index 7242760d08..aebbcdf5db 100644
--- a/sharding-core/src/test/resources/parser/select.xml
+++ b/sharding-core/src/test/resources/parser/select.xml
@@ -7,7 +7,7 @@
             <table name="t_order" alias="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="22" original-literals="t_order" />
+            <table-token start-index="22" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -26,7 +26,7 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order_item" />
+            <table-token start-index="14" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -38,7 +38,7 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order_item" />
+            <table-token start-index="14" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -50,7 +50,7 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order_item" />
+            <table-token start-index="14" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -62,7 +62,7 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order_item" />
+            <table-token start-index="14" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -74,7 +74,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -93,7 +93,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -112,7 +112,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -137,7 +137,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -163,7 +163,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -187,7 +187,7 @@
             <table name="t_order" alias="o"/>
         </tables>
         <tokens>
-            <table-token start-index="37" original-literals="t_order" />
+            <table-token start-index="37" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -214,8 +214,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -240,8 +240,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="i" name="item_id" order-direction="ASC" />
@@ -254,8 +254,8 @@
             <table name="T_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="T_ORDER" />
-            <table-token start-index="31" original-literals="T_order_item" />
+            <table-token start-index="16" table-name="T_ORDER" />
+            <table-token start-index="31" table-name="T_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -280,8 +280,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -306,8 +306,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -332,8 +332,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -358,8 +358,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -383,7 +383,7 @@
             <table name="t_order_item" alias="length" />
         </tables>
         <tokens>
-            <table-token start-index="36" original-literals="t_order_item" />
+            <table-token start-index="36" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -400,8 +400,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="56" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="56" table-name="t_order_item" />
             <index-token start-index="38" stop-index="48" table-name="t_order" />
         </tokens>
         <or-condition>
@@ -418,7 +418,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -437,7 +437,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -456,7 +456,7 @@
             <table name="t_place" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_place" />
+            <table-token start-index="14" table-name="t_place" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -472,7 +472,7 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="&quot;t_order_item&quot;" />
+            <table-token start-index="14" table-name="t_order_item" left-delimiter="&quot;" right-delimiter="&quot;" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -491,7 +491,7 @@
             </distinct-select-item>
         </select-items>
         <tokens>
-            <table-token start-index="29" original-literals="t_order_item" />
+            <table-token start-index="29" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -512,7 +512,7 @@
             </distinct-select-item>
         </select-items>
         <tokens>
-            <table-token start-index="47" original-literals="t_order" />
+            <table-token start-index="47" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column name="order_id" order-direction="ASC" />
@@ -530,7 +530,7 @@
             </distinct-select-item>
         </select-items>
         <tokens>
-            <table-token start-index="23" original-literals="t_order" />
+            <table-token start-index="23" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column name="order_id" order-direction="ASC" />
@@ -547,7 +547,7 @@
             </aggregation-select-items>
         </select-items>
         <tokens>
-            <table-token start-index="37" original-literals="t_order" />
+            <table-token start-index="37" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="28" column-name="order_id" alias="s" />
         </tokens>
     </parser-result>
@@ -562,7 +562,7 @@
             </aggregation-select-items>
         </select-items>
         <tokens>
-            <table-token start-index="39" original-literals="t_order" />
+            <table-token start-index="39" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="30" column-name="order_id" alias="c" />
         </tokens>
     </parser-result>
@@ -580,7 +580,7 @@
             </aggregation-select-items>
         </select-items>
         <tokens>
-            <table-token start-index="35" original-literals="t_order" />
+            <table-token start-index="35" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="28" column-name="order_id" alias="AGGREGATION_DISTINCT_DERIVED_0" />
         </tokens>
     </parser-result>
@@ -596,7 +596,7 @@
             </aggregation-select-items>
         </select-items>
         <tokens>
-            <table-token start-index="61" original-literals="t_order" />
+            <table-token start-index="61" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="30" column-name="order_id" alias="AGGREGATION_DISTINCT_DERIVED_0" />
             <aggregation-distinct-token start-index="33" stop-index="54" column-name="order_id" alias="AGGREGATION_DISTINCT_DERIVED_1" />
         </tokens>
@@ -618,7 +618,7 @@
             <order-by-column name="order_id" order-direction="ASC" />
         </order-by-columns>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
             <aggregation-distinct-token start-index="17" stop-index="40" column-name="order_id" alias="c" />
         </tokens>
     </parser-result>
@@ -639,7 +639,7 @@
             <order-by-column name="order_id" order-direction="ASC" />
         </order-by-columns>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="30" column-name="order_id" alias="c" />
         </tokens>
     </parser-result>
@@ -656,7 +656,7 @@
             </distinct-select-item>
         </select-items>
         <tokens>
-            <table-token start-index="30" original-literals="t_order_item" />
+            <table-token start-index="30" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
@@ -673,7 +673,7 @@
             </aggregation-select-items>
         </select-items>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="40" column-name="user_id+order_id" alias="c" />
         </tokens>
     </parser-result>
@@ -690,7 +690,7 @@
             </aggregation-select-items>
         </select-items>
         <tokens>
-            <table-token start-index="77" original-literals="t_order" />
+            <table-token start-index="77" table-name="t_order" />
             <aggregation-distinct-token start-index="7" stop-index="28" column-name="order_id" alias="AGGREGATION_DISTINCT_DERIVED_0" />
             <aggregation-distinct-token start-index="30" stop-index="53" column-name="order_id" alias="AGGREGATION_DISTINCT_DERIVED_1" />
         </tokens>
@@ -701,7 +701,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" skipped-schema-name-length = "4" original-literals="t_order" />
+            <table-token start-index="14" skipped-schema-name-length = "4" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -710,7 +710,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -719,7 +719,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -728,7 +728,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="83" original-literals="t_order" />
+            <table-token start-index="83" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -737,7 +737,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="77" original-literals="t_order" />
+            <table-token start-index="77" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -746,7 +746,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="31" original-literals="t_order" />
+            <table-token start-index="31" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -755,7 +755,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="31" original-literals="t_order" />
+            <table-token start-index="31" table-name="t_order" />
         </tokens>
     </parser-result>
 </parser-result-sets>
diff --git a/sharding-core/src/test/resources/parser/select_aggregate.xml b/sharding-core/src/test/resources/parser/select_aggregate.xml
index ea47f1902d..87e98f7a3d 100644
--- a/sharding-core/src/test/resources/parser/select_aggregate.xml
+++ b/sharding-core/src/test/resources/parser/select_aggregate.xml
@@ -5,7 +5,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -19,7 +19,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="37" original-literals="t_order" />
+            <table-token start-index="37" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -33,7 +33,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="37" original-literals="t_order" />
+            <table-token start-index="37" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -47,7 +47,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="37" original-literals="t_order" />
+            <table-token start-index="37" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -61,7 +61,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -75,7 +75,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -89,7 +89,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
             <items-token begin-position="35">
                 <items>
                     <item>COUNT(user_id) AS AVG_DERIVED_COUNT_0 </item>
@@ -113,8 +113,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="36" original-literals="t_order" />
-            <table-token start-index="47" original-literals="t_order_item" />
+            <table-token start-index="36" table-name="t_order" />
+            <table-token start-index="47" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -141,8 +141,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="36" original-literals="t_order" />
-            <table-token start-index="51" original-literals="t_order_item" />
+            <table-token start-index="36" table-name="t_order" />
+            <table-token start-index="51" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -168,7 +168,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="46" original-literals="t_order" />
+            <table-token start-index="46" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
diff --git a/sharding-core/src/test/resources/parser/select_expression.xml b/sharding-core/src/test/resources/parser/select_expression.xml
index 32d911319a..184276043d 100644
--- a/sharding-core/src/test/resources/parser/select_expression.xml
+++ b/sharding-core/src/test/resources/parser/select_expression.xml
@@ -5,7 +5,7 @@
             <table name="t_order" alias="o"/>
         </tables>
         <tokens>
-            <table-token start-index="38" original-literals="t_order" />
+            <table-token start-index="38" table-name="t_order" />
             <items-token begin-position="33">
                 <items>
                     <item>o.order_id AS ORDER_BY_DERIVED_0 </item>
@@ -22,7 +22,7 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="51" original-literals="`t_order_item`" />
+            <table-token start-index="51" table-name="t_order_item" left-delimiter="`" right-delimiter="`" />
         </tokens>
         <order-by-columns>
             <order-by-column name="DATE(i.creation_date)" order-direction="DESC" alias="creation_date"/>
@@ -34,7 +34,7 @@
             <table name="t_order_item" alias="t"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order_item" />
+            <table-token start-index="14" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
diff --git a/sharding-core/src/test/resources/parser/select_group_by.xml b/sharding-core/src/test/resources/parser/select_group_by.xml
index af0e1c5dcd..48f26d44d5 100644
--- a/sharding-core/src/test/resources/parser/select_group_by.xml
+++ b/sharding-core/src/test/resources/parser/select_group_by.xml
@@ -5,7 +5,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -25,7 +25,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="53" original-literals="t_order" />
+            <table-token start-index="53" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -45,7 +45,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="51" original-literals="t_order" />
+            <table-token start-index="51" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -65,7 +65,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="51" original-literals="t_order" />
+            <table-token start-index="51" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -85,7 +85,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
             <items-token begin-position="44">
                 <items>
                     <item>COUNT(order_id) AS AVG_DERIVED_COUNT_0 </item>
@@ -114,7 +114,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
@@ -135,8 +135,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="36" original-literals="t_order" />
-            <table-token start-index="51" original-literals="t_order_item" />
+            <table-token start-index="36" table-name="t_order" />
+            <table-token start-index="51" table-name="t_order_item" />
             <items-token begin-position="31">
                 <items>
                     <item>o.user_id AS GROUP_BY_DERIVED_0 </item>
@@ -174,7 +174,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="20" original-literals="t_order" />
+            <table-token start-index="20" table-name="t_order" />
             <row-count-token row-count="5" begin-position="68" />
         </tokens>
         <group-by-columns>
@@ -191,7 +191,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="49" original-literals="t_order" />
+            <table-token start-index="49" table-name="t_order" />
             <row-count-token row-count="5" begin-position="103" />
         </tokens>
         <select-items>
@@ -213,7 +213,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="26" original-literals="t_order" />
+            <table-token start-index="26" table-name="t_order" />
         </tokens>
         <group-by-columns>
             <group-by-column name="user_id" owner="o" alias="uid" order-direction="ASC" />
@@ -228,7 +228,7 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="91" original-literals="`t_order_item`" />
+            <table-token start-index="91" table-name="t_order_item" left-delimiter="`" right-delimiter="`" />
             <order-by-token placeholder-begin-position="178" literal-begin-position="184" />
         </tokens>
         <or-condition>
@@ -257,7 +257,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="58" original-literals="t_order" />
+            <table-token start-index="58" table-name="t_order" />
             <order-by-token placeholder-begin-position="80" literal-begin-position="80" />
         </tokens>
         <select-items>
@@ -278,7 +278,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="53" original-literals="t_order" />
+            <table-token start-index="53" table-name="t_order" />
         </tokens>
         <select-items>
             <aggregation-select-items>
diff --git a/sharding-core/src/test/resources/parser/select_or.xml b/sharding-core/src/test/resources/parser/select_or.xml
index 366bd7a938..81ffa4badc 100644
--- a/sharding-core/src/test/resources/parser/select_or.xml
+++ b/sharding-core/src/test/resources/parser/select_or.xml
@@ -5,7 +5,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -26,7 +26,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -47,7 +47,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
     </parser-result>
     
@@ -56,7 +56,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -80,7 +80,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -124,8 +124,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -153,8 +153,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
diff --git a/sharding-core/src/test/resources/parser/select_order_by.xml b/sharding-core/src/test/resources/parser/select_order_by.xml
index e166de726f..ce1d2f516e 100644
--- a/sharding-core/src/test/resources/parser/select_order_by.xml
+++ b/sharding-core/src/test/resources/parser/select_order_by.xml
@@ -5,7 +5,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="o" name="order_id" order-direction="ASC" />
@@ -19,8 +19,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="27" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="27" table-name="t_order_item" />
             <items-token begin-position="11">
                 <items>
                     <item>o.order_id AS ORDER_BY_DERIVED_0 </item>
@@ -38,7 +38,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="o" name="order_id" alias="gen_order_id_" order-direction="ASC" />
@@ -51,8 +51,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="27" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="27" table-name="t_order_item" />
             <items-token begin-position="11">
                 <items>
                     <item>o.order_id AS ORDER_BY_DERIVED_0 </item>
@@ -72,7 +72,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="o" name="order_id" alias="gen_order_id_" order-direction="ASC" />
@@ -85,7 +85,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="40" original-literals="t_order" />
+            <table-token start-index="40" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="o" name="order_id" alias="gen_order_id_" order-direction="ASC" />
@@ -97,7 +97,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="29" original-literals="t_order" />
+            <table-token start-index="29" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="o" name="order_id" order-direction="ASC" />
@@ -109,7 +109,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
+            <table-token start-index="16" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="o" name="order_id" order-direction="ASC" />
@@ -121,7 +121,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column name="order_id" order-direction="ASC" />
@@ -134,7 +134,7 @@
             <!--<table name="t_order" alias="o" />-->
         <!--</tables>-->
         <!--<tokens>-->
-            <!--<table-token start-index="14" original-literals="t_order" />-->
+            <!--<table-token start-index="14" table-name="t_order" />-->
         <!--</tokens>-->
         <!--<order-by-columns>-->
             <!--<order-by-column name="order_id" order-direction="ASC" />-->
@@ -146,9 +146,9 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="7" original-literals="t_order" />
-            <table-token start-index="22" original-literals="t_order" />
-            <table-token start-index="39" original-literals="t_order" />
+            <table-token start-index="7" table-name="t_order" />
+            <table-token start-index="22" table-name="t_order" />
+            <table-token start-index="39" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column owner="t_order" name="order_id" order-direction="ASC" />
@@ -160,7 +160,7 @@
             <table name="t_order" />
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order" />
+            <table-token start-index="14" table-name="t_order" />
         </tokens>
         <order-by-columns>
             <order-by-column name="order_id" order-direction="ASC" />
@@ -173,8 +173,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="21" original-literals="t_order" />
-            <table-token start-index="36" original-literals="t_order_item" />
+            <table-token start-index="21" table-name="t_order" />
+            <table-token start-index="36" table-name="t_order_item" />
         </tokens>
         <order-by-columns>
             <order-by-column name="item_id" order-direction="ASC" />
diff --git a/sharding-core/src/test/resources/parser/select_pagination.xml b/sharding-core/src/test/resources/parser/select_pagination.xml
index 63129cf42e..f63b4231fa 100644
--- a/sharding-core/src/test/resources/parser/select_pagination.xml
+++ b/sharding-core/src/test/resources/parser/select_pagination.xml
@@ -6,8 +6,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
             <offset-token begin-position="188" offset="5" />
         </tokens>
         <or-condition>
@@ -34,8 +34,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
             <row-count-token begin-position="187" row-count="5" />
         </tokens>
         <or-condition>
@@ -62,8 +62,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="`t_order`" />
-            <table-token start-index="33" original-literals="`t_order_item`" />
+            <table-token start-index="16" table-name="t_order" left-delimiter="`" right-delimiter="`" />
+            <table-token start-index="33" table-name="t_order_item" left-delimiter="`" right-delimiter="`" />
             <offset-token begin-position="195" offset="5" />
             <row-count-token begin-position="198" row-count="3" />
         </tokens>
@@ -91,8 +91,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="167" original-literals="t_order" />
-            <table-token start-index="182" original-literals="t_order_item" />
+            <table-token start-index="167" table-name="t_order" />
+            <table-token start-index="182" table-name="t_order_item" />
             <row-count-token begin-position="27" row-count="3" />
         </tokens>
         <or-condition>
@@ -119,8 +119,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
             <offset-token begin-position="188" offset="5" />
             <row-count-token begin-position="196" row-count="3" />
         </tokens>
@@ -148,8 +148,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="167" original-literals="t_order" />
-            <table-token start-index="182" original-literals="t_order_item" />
+            <table-token start-index="167" table-name="t_order" />
+            <table-token start-index="182" table-name="t_order_item" />
             <offset-token begin-position="338" offset="6" />
             <row-count-token begin-position="27" row-count="3" />
         </tokens>
@@ -177,8 +177,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="167" original-literals="t_order" />
-            <table-token start-index="182" original-literals="t_order_item" />
+            <table-token start-index="167" table-name="t_order" />
+            <table-token start-index="182" table-name="t_order_item" />
             <offset-token begin-position="339" offset="6" />
             <row-count-token begin-position="27" row-count="3" />
         </tokens>
@@ -206,8 +206,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="146" original-literals="t_order" />
-            <table-token start-index="167" original-literals="t_order_item" />
+            <table-token start-index="146" table-name="t_order" />
+            <table-token start-index="167" table-name="t_order_item" />
             <items-token begin-position="141">
                 <items>
                     <item>i.item_id AS ORDER_BY_DERIVED_0 </item>
@@ -239,8 +239,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="146" original-literals="t_order" />
-            <table-token start-index="167" original-literals="t_order_item" />
+            <table-token start-index="146" table-name="t_order" />
+            <table-token start-index="167" table-name="t_order_item" />
             <items-token begin-position="141">
                 <items>
                     <item>i.item_id AS ORDER_BY_DERIVED_0 </item>
@@ -273,8 +273,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="146" original-literals="t_order" />
-            <table-token start-index="167" original-literals="t_order_item" />
+            <table-token start-index="146" table-name="t_order" />
+            <table-token start-index="167" table-name="t_order_item" />
             <items-token begin-position="141">
                 <items>
                     <item>i.item_id AS ORDER_BY_DERIVED_0 </item>
@@ -306,7 +306,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="14" original-literals="t_order"/>
+            <table-token start-index="14" table-name="t_order"/>
             <row-count-token begin-position="38" row-count="20"/>
         </tokens>
         <order-by-columns>
diff --git a/sharding-core/src/test/resources/parser/select_pagination_group_by_order_by.xml b/sharding-core/src/test/resources/parser/select_pagination_group_by_order_by.xml
index 5c7048b01d..00e5e2c330 100644
--- a/sharding-core/src/test/resources/parser/select_pagination_group_by_order_by.xml
+++ b/sharding-core/src/test/resources/parser/select_pagination_group_by_order_by.xml
@@ -6,8 +6,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="22" original-literals="t_order" />
-            <table-token start-index="37" original-literals="t_order_item" />
+            <table-token start-index="22" table-name="t_order" />
+            <table-token start-index="37" table-name="t_order_item" />
             <items-token begin-position="17">
                 <items>
                     <item>i.item_id AS ORDER_BY_DERIVED_0 </item>
@@ -44,8 +44,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="22" original-literals="t_order" />
-            <table-token start-index="37" original-literals="t_order_item" />
+            <table-token start-index="22" table-name="t_order" />
+            <table-token start-index="37" table-name="t_order_item" />
             <offset-token begin-position="212" offset="5" />
             <row-count-token begin-position="215" row-count="3" />
             <items-token begin-position="17">
@@ -81,8 +81,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="165" original-literals="t_order" />
-            <table-token start-index="180" original-literals="t_order_item" />
+            <table-token start-index="165" table-name="t_order" />
+            <table-token start-index="180" table-name="t_order_item" />
             <offset-token begin-position="355" offset="6" />
             <row-count-token begin-position="26" row-count="3" />
         </tokens>
@@ -113,8 +113,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="167" original-literals="t_order" />
-            <table-token start-index="182" original-literals="t_order_item" />
+            <table-token start-index="167" table-name="t_order" />
+            <table-token start-index="182" table-name="t_order_item" />
             <offset-token begin-position="357" offset="6" />
             <row-count-token begin-position="27" row-count="3" />
         </tokens>
@@ -145,8 +145,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="165" original-literals="t_order" />
-            <table-token start-index="180" original-literals="t_order_item" />
+            <table-token start-index="165" table-name="t_order" />
+            <table-token start-index="180" table-name="t_order_item" />
             <items-token begin-position="160">
                 <items>
                     <item>i.user_id AS GROUP_BY_DERIVED_0 </item>
@@ -182,8 +182,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="167" original-literals="t_order" />
-            <table-token start-index="182" original-literals="t_order_item" />
+            <table-token start-index="167" table-name="t_order" />
+            <table-token start-index="182" table-name="t_order_item" />
             <items-token begin-position="162">
                 <items>
                     <item>i.user_id AS GROUP_BY_DERIVED_0 </item>
@@ -219,8 +219,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="146" original-literals="t_order" />
-            <table-token start-index="167" original-literals="t_order_item" />
+            <table-token start-index="146" table-name="t_order" />
+            <table-token start-index="167" table-name="t_order_item" />
             <items-token begin-position="141">
                 <items>
                     <item>i.item_id AS ORDER_BY_DERIVED_0 </item>
@@ -257,8 +257,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="146" original-literals="t_order" />
-            <table-token start-index="167" original-literals="t_order_item" />
+            <table-token start-index="146" table-name="t_order" />
+            <table-token start-index="167" table-name="t_order_item" />
             <items-token begin-position="141">
                 <items>
                     <item>i.item_id AS ORDER_BY_DERIVED_0 </item>
diff --git a/sharding-core/src/test/resources/parser/select_relation.xml b/sharding-core/src/test/resources/parser/select_relation.xml
index 9e01ac6ea1..45b1c7a29a 100644
--- a/sharding-core/src/test/resources/parser/select_relation.xml
+++ b/sharding-core/src/test/resources/parser/select_relation.xml
@@ -6,8 +6,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="37" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="37" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -24,12 +24,12 @@
             <table name="t_order_item" />
         </tables>
         <tokens>
-            <table-token start-index="7" original-literals="t_order_item" />
-            <table-token start-index="27" original-literals="t_order" />
-            <table-token start-index="40" original-literals="t_order_item" />
-            <table-token start-index="56" original-literals="t_order" />
-            <table-token start-index="75" original-literals="t_order_item" />
-            <table-token start-index="103" original-literals="t_order" />
+            <table-token start-index="7" table-name="t_order_item" />
+            <table-token start-index="27" table-name="t_order" />
+            <table-token start-index="40" table-name="t_order_item" />
+            <table-token start-index="56" table-name="t_order" />
+            <table-token start-index="75" table-name="t_order_item" />
+            <table-token start-index="103" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -46,8 +46,8 @@
             <table name="t_order_item" alias="i"/>
         </tables>
         <tokens>
-            <table-token start-index="16" original-literals="t_order" />
-            <table-token start-index="31" original-literals="t_order_item" />
+            <table-token start-index="16" table-name="t_order" />
+            <table-token start-index="31" table-name="t_order_item" />
         </tokens>
         <or-condition>
             <and-condition>
diff --git a/sharding-core/src/test/resources/parser/select_sub_query.xml b/sharding-core/src/test/resources/parser/select_sub_query.xml
index e371f20231..0e8002e6ef 100644
--- a/sharding-core/src/test/resources/parser/select_sub_query.xml
+++ b/sharding-core/src/test/resources/parser/select_sub_query.xml
@@ -6,7 +6,7 @@
             <table name="t_order" alias="o" />
         </tables>
         <tokens>
-            <table-token start-index="33" original-literals="t_order" />
+            <table-token start-index="33" table-name="t_order" />
         </tokens>
         <or-condition>
             <and-condition>
@@ -25,8 +25,8 @@
             <table name="t_order_item" alias="i" />
         </tables>
         <tokens>
-            <table-token start-index="33" original-literals="t_order" />
-            <table-token start-index="44" original-literals="t_order_item" />
+            <table-token start-index="33" table-name="t_order" />
+            <table-token start-index="44" table-name="t_order_item" />
         </tokens>
         <conditions>
             <condition column-name="order_id" table-name="t_order" operator="IN">
@@ -42,7 +42,7 @@
             <table name="t_order"/>
         </tables>
         <tokens>
-            <table-token start-index="52" original-literals="t_order" />
+            <table-token start-index="52" table-name="t_order" />
         </tokens>
         <aggregation-select-items>
             <aggregation-select-item type="COUNT" inner-expression="(1)" alias="orders_count" />
@@ -54,7 +54,7 @@
             <table name="t_order_item"/>
         </tables>
         <tokens>
-            <table-token start-index="64" original-literals="t_order_item" />
+            <table-token start-index="64" table-name="t_order_item" />
         </tokens>
         <aggregation-select-items>
             <aggregation-select-item type="COUNT" inner-expression="(1)" alias="order_items_count" />
-- 
GitLab