This is an automated email from the ASF dual-hosted git repository.
critas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iotdb-docs.git
The following commit(s) were added to refs/heads/main by this push:
new 32401245 Modify the syntax for creating tables (#758)
32401245 is described below
commit 32401245314af0c26a1bb7c2e087499ffbd25e30
Author: W1y1r <[email protected]>
AuthorDate: Wed May 21 14:14:20 2025 +0800
Modify the syntax for creating tables (#758)
---
.../Master/Table/Basic-Concept/Table-Management.md | 46 ++++++++++++---------
.../latest-Table/Basic-Concept/Table-Management.md | 47 +++++++++++++---------
.../Master/Table/Basic-Concept/Table-Management.md | 46 ++++++++++++---------
.../latest-Table/Basic-Concept/Table-Management.md | 46 ++++++++++++---------
4 files changed, 105 insertions(+), 80 deletions(-)
diff --git a/src/UserGuide/Master/Table/Basic-Concept/Table-Management.md
b/src/UserGuide/Master/Table/Basic-Concept/Table-Management.md
index 3bce6199..07ef3bd5 100644
--- a/src/UserGuide/Master/Table/Basic-Concept/Table-Management.md
+++ b/src/UserGuide/Master/Table/Basic-Concept/Table-Management.md
@@ -32,25 +32,31 @@ Manually create a table within the current or specified
database.The format is "
**Syntax:**
```SQL
-CREATE TABLE (IF NOT EXISTS)? <TABLE_NAME>
- '(' (columnDefinition (',' columnDefinition)*)? ')'
- (COMMENT 'TABLE_COMMENT')? (WITH properties)?
-
-columnDefinition
- : identifier columnCategory=(TAG | ATTRIBUTE)
- | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
+createTableStatement
+ : CREATE TABLE (IF NOT EXISTS)? qualifiedName
+ '(' (columnDefinition (',' columnDefinition)*)? ')'
+ charsetDesc?
+ comment?
+ (WITH properties)?
+ ;
+
+charsetDesc
+ : DEFAULT? (CHAR SET | CHARSET | CHARACTER SET) EQ? identifierOrString
;
-
-properties
- : '(' propertyAssignments ')'
+
+columnDefinition
+ : identifier columnCategory=(TAG | ATTRIBUTE | TIME) charsetName? comment?
+ | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
charsetName? comment?
;
-propertyAssignments
- : property (',' property)*
+charsetName
+ : CHAR SET identifier
+ | CHARSET identifier
+ | CHARACTER SET identifier
;
-property
- : identifier EQ propertyValue
+comment
+ : COMMENT string
;
```
@@ -76,18 +82,18 @@ CREATE TABLE table1 (
plant_id STRING TAG,
device_id STRING TAG,
model_id STRING ATTRIBUTE,
- maintenance STRING ATTRIBUTE,
- temperature FLOAT FIELD,
- humidity FLOAT FIELD,
- status Boolean FIELD,
- arrival_time TIMESTAMP FIELD
+ maintenance STRING ATTRIBUTE COMMENT 'maintenance',
+ temperature FLOAT FIELD COMMENT 'temperature',
+ humidity FLOAT FIELD COMMENT 'humidity',
+ status Boolean FIELD COMMENT 'status',
+ arrival_time TIMESTAMP FIELD COMMENT 'arrival_time'
) COMMENT 'table1' WITH (TTL=31536000000);
CREATE TABLE if not exists table2 ();
CREATE TABLE tableC (
"Site" STRING TAG,
- "Temperature" int32 FIELD
+ "Temperature" int32 FIELD COMMENT 'temperature'
) with (TTL=DEFAULT);
```
diff --git a/src/UserGuide/latest-Table/Basic-Concept/Table-Management.md
b/src/UserGuide/latest-Table/Basic-Concept/Table-Management.md
index 3bce6199..bf0fe988 100644
--- a/src/UserGuide/latest-Table/Basic-Concept/Table-Management.md
+++ b/src/UserGuide/latest-Table/Basic-Concept/Table-Management.md
@@ -32,25 +32,31 @@ Manually create a table within the current or specified
database.The format is "
**Syntax:**
```SQL
-CREATE TABLE (IF NOT EXISTS)? <TABLE_NAME>
- '(' (columnDefinition (',' columnDefinition)*)? ')'
- (COMMENT 'TABLE_COMMENT')? (WITH properties)?
-
-columnDefinition
- : identifier columnCategory=(TAG | ATTRIBUTE)
- | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
+createTableStatement
+ : CREATE TABLE (IF NOT EXISTS)? qualifiedName
+ '(' (columnDefinition (',' columnDefinition)*)? ')'
+ charsetDesc?
+ comment?
+ (WITH properties)?
+ ;
+
+charsetDesc
+ : DEFAULT? (CHAR SET | CHARSET | CHARACTER SET) EQ? identifierOrString
;
-
-properties
- : '(' propertyAssignments ')'
+
+columnDefinition
+ : identifier columnCategory=(TAG | ATTRIBUTE | TIME) charsetName? comment?
+ | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
charsetName? comment?
;
-propertyAssignments
- : property (',' property)*
+charsetName
+ : CHAR SET identifier
+ | CHARSET identifier
+ | CHARACTER SET identifier
;
-property
- : identifier EQ propertyValue
+comment
+ : COMMENT string
;
```
@@ -76,18 +82,19 @@ CREATE TABLE table1 (
plant_id STRING TAG,
device_id STRING TAG,
model_id STRING ATTRIBUTE,
- maintenance STRING ATTRIBUTE,
- temperature FLOAT FIELD,
- humidity FLOAT FIELD,
- status Boolean FIELD,
- arrival_time TIMESTAMP FIELD
+ maintenance STRING ATTRIBUTE COMMENT 'maintenance',
+ temperature FLOAT FIELD COMMENT 'temperature',
+ humidity FLOAT FIELD COMMENT 'humidity',
+ status Boolean FIELD COMMENT 'status',
+ arrival_time TIMESTAMP FIELD COMMENT 'arrival_time'
) COMMENT 'table1' WITH (TTL=31536000000);
+
CREATE TABLE if not exists table2 ();
CREATE TABLE tableC (
"Site" STRING TAG,
- "Temperature" int32 FIELD
+ "Temperature" int32 FIELD COMMENT 'temperature'
) with (TTL=DEFAULT);
```
diff --git a/src/zh/UserGuide/Master/Table/Basic-Concept/Table-Management.md
b/src/zh/UserGuide/Master/Table/Basic-Concept/Table-Management.md
index e48b2b19..bbabeeb7 100644
--- a/src/zh/UserGuide/Master/Table/Basic-Concept/Table-Management.md
+++ b/src/zh/UserGuide/Master/Table/Basic-Concept/Table-Management.md
@@ -32,25 +32,31 @@
**语法：**
```SQL
-CREATE TABLE (IF NOT EXISTS)? <TABLE_NAME>
- '(' (columnDefinition (',' columnDefinition)*)? ')'
- (COMMENT 'TABLE_COMMENT')? (WITH properties)?
-
-columnDefinition
- : identifier columnCategory=(TAG | ATTRIBUTE)
- | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
+createTableStatement
+ : CREATE TABLE (IF NOT EXISTS)? qualifiedName
+ '(' (columnDefinition (',' columnDefinition)*)? ')'
+ charsetDesc?
+ comment?
+ (WITH properties)?
+ ;
+
+charsetDesc
+ : DEFAULT? (CHAR SET | CHARSET | CHARACTER SET) EQ? identifierOrString
;
-
-properties
- : '(' propertyAssignments ')'
+
+columnDefinition
+ : identifier columnCategory=(TAG | ATTRIBUTE | TIME) charsetName? comment?
+ | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
charsetName? comment?
;
-propertyAssignments
- : property (',' property)*
+charsetName
+ : CHAR SET identifier
+ | CHARSET identifier
+ | CHARACTER SET identifier
;
-property
- : identifier EQ propertyValue
+comment
+ : COMMENT string
;
```
@@ -80,18 +86,18 @@ CREATE TABLE table1 (
plant_id STRING TAG,
device_id STRING TAG,
model_id STRING ATTRIBUTE,
- maintenance STRING ATTRIBUTE,
- temperature FLOAT FIELD,
- humidity FLOAT FIELD,
- status Boolean FIELD,
- arrival_time TIMESTAMP FIELD
+ maintenance STRING ATTRIBUTE COMMENT 'maintenance',
+ temperature FLOAT FIELD COMMENT 'temperature',
+ humidity FLOAT FIELD COMMENT 'humidity',
+ status Boolean FIELD COMMENT 'status',
+ arrival_time TIMESTAMP FIELD COMMENT 'arrival_time'
) COMMENT 'table1' WITH (TTL=31536000000);
CREATE TABLE if not exists table2 ();
CREATE TABLE tableC (
"场站" STRING TAG,
- "温度" int32 FIELD
+ "温度" int32 FIELD COMMENT 'temperature'
) with (TTL=DEFAULT);
```
diff --git a/src/zh/UserGuide/latest-Table/Basic-Concept/Table-Management.md
b/src/zh/UserGuide/latest-Table/Basic-Concept/Table-Management.md
index e48b2b19..bbabeeb7 100644
--- a/src/zh/UserGuide/latest-Table/Basic-Concept/Table-Management.md
+++ b/src/zh/UserGuide/latest-Table/Basic-Concept/Table-Management.md
@@ -32,25 +32,31 @@
**语法：**
```SQL
-CREATE TABLE (IF NOT EXISTS)? <TABLE_NAME>
- '(' (columnDefinition (',' columnDefinition)*)? ')'
- (COMMENT 'TABLE_COMMENT')? (WITH properties)?
-
-columnDefinition
- : identifier columnCategory=(TAG | ATTRIBUTE)
- | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
+createTableStatement
+ : CREATE TABLE (IF NOT EXISTS)? qualifiedName
+ '(' (columnDefinition (',' columnDefinition)*)? ')'
+ charsetDesc?
+ comment?
+ (WITH properties)?
+ ;
+
+charsetDesc
+ : DEFAULT? (CHAR SET | CHARSET | CHARACTER SET) EQ? identifierOrString
;
-
-properties
- : '(' propertyAssignments ')'
+
+columnDefinition
+ : identifier columnCategory=(TAG | ATTRIBUTE | TIME) charsetName? comment?
+ | identifier type (columnCategory=(TAG | ATTRIBUTE | TIME | FIELD))?
charsetName? comment?
;
-propertyAssignments
- : property (',' property)*
+charsetName
+ : CHAR SET identifier
+ | CHARSET identifier
+ | CHARACTER SET identifier
;
-property
- : identifier EQ propertyValue
+comment
+ : COMMENT string
;
```
@@ -80,18 +86,18 @@ CREATE TABLE table1 (
plant_id STRING TAG,
device_id STRING TAG,
model_id STRING ATTRIBUTE,
- maintenance STRING ATTRIBUTE,
- temperature FLOAT FIELD,
- humidity FLOAT FIELD,
- status Boolean FIELD,
- arrival_time TIMESTAMP FIELD
+ maintenance STRING ATTRIBUTE COMMENT 'maintenance',
+ temperature FLOAT FIELD COMMENT 'temperature',
+ humidity FLOAT FIELD COMMENT 'humidity',
+ status Boolean FIELD COMMENT 'status',
+ arrival_time TIMESTAMP FIELD COMMENT 'arrival_time'
) COMMENT 'table1' WITH (TTL=31536000000);
CREATE TABLE if not exists table2 ();
CREATE TABLE tableC (
"场站" STRING TAG,
- "温度" int32 FIELD
+ "温度" int32 FIELD COMMENT 'temperature'
) with (TTL=DEFAULT);
```
