k1LoW · k1LoW · Jul 8, 2019 · Jul 8, 2019 · Jul 8, 2019 · Jul 8, 2019
diff --git a/datasource/datasource_test.go b/datasource/datasource_test.go
@@ -16,10 +16,10 @@ var tests = []struct {
 	tableCount    int
 	relationCount int
 }{
-	{"my://root:mypass@localhost:33306/testdb", "testdb", 8, 6},
-	{"pg://postgres:pgpass@localhost:55432/testdb?sslmode=disable", "testdb", 9, 7},
+	{"my://root:mypass@localhost:33306/testdb", "testdb", 9, 6},
+	{"pg://postgres:pgpass@localhost:55432/testdb?sslmode=disable", "testdb", 10, 7},
 	{"json://../testdata/testdb.json", "testdb", 7, 9},
-	{"ms://SA:MSSQLServer-Passw0rd@localhost:11433/testdb", "testdb", 8, 6},
+	{"ms://SA:MSSQLServer-Passw0rd@localhost:11433/testdb", "testdb", 9, 6},
 }
 
 func TestMain(m *testing.M) {

diff --git a/drivers/mysql/mysql.go b/drivers/mysql/mysql.go
@@ -55,7 +55,7 @@ SELECT table_name, table_type, table_comment FROM information_schema.tables WHER
 
 		// table definition
 		if tableType == "BASE TABLE" {
-			tableDefRows, err := m.db.Query(fmt.Sprintf("SHOW CREATE TABLE %s", tableName))
+			tableDefRows, err := m.db.Query(fmt.Sprintf("SHOW CREATE TABLE `%s`", tableName))
 			defer tableDefRows.Close()
 			if err != nil {
 				return errors.WithStack(err)

diff --git a/drivers/sqlite/sqlite.go b/drivers/sqlite/sqlite.go
@@ -87,7 +87,7 @@ WHERE name != 'sqlite_sequence' AND (type = 'table' OR type = 'view');`)
 		constraints := []*schema.Constraint{}
 
 		// columns
-		columnRows, err := l.db.Query(fmt.Sprintf("PRAGMA table_info(%s)", tableName))
+		columnRows, err := l.db.Query(fmt.Sprintf("PRAGMA table_info(`%s`)", tableName))
 		defer columnRows.Close()
 		if err != nil {
 			return errors.WithStack(err)
@@ -132,7 +132,7 @@ WHERE name != 'sqlite_sequence' AND (type = 'table' OR type = 'view');`)
 		fkMap := map[string]*fk{}
 		fkSlice := []*fk{}
 
-		foreignKeyRows, err := l.db.Query(fmt.Sprintf("PRAGMA foreign_key_list(%s)", tableName))
+		foreignKeyRows, err := l.db.Query(fmt.Sprintf("PRAGMA foreign_key_list(`%s`)", tableName))
 		defer foreignKeyRows.Close()
 		if err != nil {
 			return errors.WithStack(err)
@@ -207,7 +207,7 @@ WHERE name != 'sqlite_sequence' AND (type = 'table' OR type = 'view');`)
 		}
 
 		// indexes and constraints(UNIQUE, PRIMARY KEY)
-		indexRows, err := l.db.Query(fmt.Sprintf("PRAGMA index_list(%s)", tableName))
+		indexRows, err := l.db.Query(fmt.Sprintf("PRAGMA index_list(`%s`)", tableName))
 		defer indexRows.Close()
 		if err != nil {
 			return errors.WithStack(err)

diff --git a/sample/adjust/README.md b/sample/adjust/README.md
@@ -12,6 +12,7 @@
 | [logs](logs.md)                               | 7       | audit log table                            | BASE TABLE |
 | [post_comments](post_comments.md)             | 7       | post and comments View table               | VIEW       |
 | [CamelizeTable](CamelizeTable.md)             | 2       |                                            | BASE TABLE |
+| [hyphen-table](hyphen-table.md)               | 3       |                                            | BASE TABLE |
 | [administrator.blogs](administrator.blogs.md) | 6       |                                            | BASE TABLE |
 
 ## Relations

diff --git a/sample/adjust/hyphen-table.md b/sample/adjust/hyphen-table.md
@@ -0,0 +1,19 @@
+# hyphen-table
+
+## Description
+
+## Columns
+
+| Name          | Type                        | Default            | Nullable | Children | Parents | Comment |
+| ------------- | --------------------------- | ------------------ | -------- | -------- | ------- | ------- |
+| id            | uuid                        | uuid_generate_v4() | false    |          |         |         |
+| hyphen-column | text                        |                    | false    |          |         |         |
+| created       | timestamp without time zone |                    | false    |          |         |         |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/adjust/hyphen-table.png b/sample/adjust/hyphen-table.png
diff --git a/sample/adjust/schema.png b/sample/adjust/schema.png
diff --git a/sample/exclude/README.md b/sample/exclude/README.md
@@ -6,6 +6,7 @@
 | ---- | ------- | ------- | ---- |
 | [comment_stars](comment_stars.md) | 6 |  | BASE TABLE |
 | [comments](comments.md) | 6 | Comments<br>Multi-line<br>table<br>comment | BASE TABLE |
+| [hyphen-table](hyphen-table.md) | 3 |  | BASE TABLE |
 | [post_comments](post_comments.md) | 7 | post and comments View table | VIEW |
 | [posts](posts.md) | 7 | Posts table | BASE TABLE |
 | [user_options](user_options.md) | 4 | User options table | BASE TABLE |

diff --git a/sample/exclude/hyphen-table.md b/sample/exclude/hyphen-table.md
@@ -0,0 +1,45 @@
+# hyphen-table
+
+## Description
+
+<details>
+<summary><strong>Table Definition</strong></summary>
+
+```sql
+CREATE TABLE `hyphen-table` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `hyphen-column` text NOT NULL,
+  `created` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+```
+
+</details>
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | bigint(20) |  | false |  |  |  |
+| hyphen-column | text |  | false |  |  |  |
+| created | datetime |  | false |  |  |  |
+
+## Constraints
+
+| Name | Type | Definition |
+| ---- | ---- | ---------- |
+| PRIMARY | PRIMARY KEY | PRIMARY KEY (id) |
+
+## Indexes
+
+| Name | Definition |
+| ---- | ---------- |
+| PRIMARY | PRIMARY KEY (id) USING BTREE |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/exclude/hyphen-table.png b/sample/exclude/hyphen-table.png
diff --git a/sample/exclude/schema.png b/sample/exclude/schema.png
diff --git a/sample/mssql/README.md b/sample/mssql/README.md
@@ -12,6 +12,7 @@
 | [logs](logs.md) | 7 | audit log table | BASIC TABLE |
 | [post_comments](post_comments.md) | 7 | post and comments View table | VIEW |
 | [CamelizeTable](CamelizeTable.md) | 2 |  | BASIC TABLE |
+| [hyphen-table](hyphen-table.md) | 3 |  | BASIC TABLE |
 
 ## Relations
 

diff --git a/sample/mssql/hyphen-table.md b/sample/mssql/hyphen-table.md
@@ -0,0 +1,19 @@
+# hyphen-table
+
+## Description
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | int |  | false |  |  |  |
+| hyphen-column | text |  | false |  |  |  |
+| created | date |  | false |  |  |  |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/mssql/hyphen-table.png b/sample/mssql/hyphen-table.png
diff --git a/sample/mssql/schema.png b/sample/mssql/schema.png
diff --git a/sample/mysql/README.md b/sample/mysql/README.md
@@ -7,6 +7,7 @@
 | [CamelizeTable](CamelizeTable.md) | 2 |  | BASE TABLE |
 | [comment_stars](comment_stars.md) | 6 |  | BASE TABLE |
 | [comments](comments.md) | 6 | Comments<br>Multi-line<br>table<br>comment | BASE TABLE |
+| [hyphen-table](hyphen-table.md) | 3 |  | BASE TABLE |
 | [logs](logs.md) | 7 | audit log table | BASE TABLE |
 | [post_comments](post_comments.md) | 7 | post and comments View table | VIEW |
 | [posts](posts.md) | 7 | Posts table | BASE TABLE |

diff --git a/sample/mysql/hyphen-table.md b/sample/mysql/hyphen-table.md
@@ -0,0 +1,45 @@
+# hyphen-table
+
+## Description
+
+<details>
+<summary><strong>Table Definition</strong></summary>
+
+```sql
+CREATE TABLE `hyphen-table` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `hyphen-column` text NOT NULL,
+  `created` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+```
+
+</details>
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | bigint(20) |  | false |  |  |  |
+| hyphen-column | text |  | false |  |  |  |
+| created | datetime |  | false |  |  |  |
+
+## Constraints
+
+| Name | Type | Definition |
+| ---- | ---- | ---------- |
+| PRIMARY | PRIMARY KEY | PRIMARY KEY (id) |
+
+## Indexes
+
+| Name | Definition |
+| ---- | ---------- |
+| PRIMARY | PRIMARY KEY (id) USING BTREE |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/mysql/hyphen-table.png b/sample/mysql/hyphen-table.png
diff --git a/sample/mysql/schema.png b/sample/mysql/schema.png
diff --git a/sample/mysql8/README.md b/sample/mysql8/README.md
@@ -7,6 +7,7 @@
 | [CamelizeTable](CamelizeTable.md) | 2 |  | BASE TABLE |
 | [comment_stars](comment_stars.md) | 6 |  | BASE TABLE |
 | [comments](comments.md) | 6 | Comments<br>Multi-line<br>table<br>comment | BASE TABLE |
+| [hyphen-table](hyphen-table.md) | 3 |  | BASE TABLE |
 | [logs](logs.md) | 7 | audit log table | BASE TABLE |
 | [post_comments](post_comments.md) | 7 | post and comments View table | VIEW |
 | [posts](posts.md) | 7 | Posts table | BASE TABLE |

diff --git a/sample/mysql8/hyphen-table.md b/sample/mysql8/hyphen-table.md
@@ -0,0 +1,45 @@
+# hyphen-table
+
+## Description
+
+<details>
+<summary><strong>Table Definition</strong></summary>
+
+```sql
+CREATE TABLE `hyphen-table` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `hyphen-column` text NOT NULL,
+  `created` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
+```
+
+</details>
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | bigint(20) |  | false |  |  |  |
+| hyphen-column | text |  | false |  |  |  |
+| created | datetime |  | false |  |  |  |
+
+## Constraints
+
+| Name | Type | Definition |
+| ---- | ---- | ---------- |
+| PRIMARY | PRIMARY KEY | PRIMARY KEY (id) |
+
+## Indexes
+
+| Name | Definition |
+| ---- | ---------- |
+| PRIMARY | PRIMARY KEY (id) USING BTREE |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/mysql8/hyphen-table.png b/sample/mysql8/hyphen-table.png
diff --git a/sample/mysql8/schema.png b/sample/mysql8/schema.png
diff --git a/sample/postgres/README.md b/sample/postgres/README.md
@@ -12,6 +12,7 @@
 | [logs](logs.md) | 7 | audit log table | BASE TABLE |
 | [post_comments](post_comments.md) | 7 | post and comments View table | VIEW |
 | [CamelizeTable](CamelizeTable.md) | 2 |  | BASE TABLE |
+| [hyphen-table](hyphen-table.md) | 3 |  | BASE TABLE |
 | [administrator.blogs](administrator.blogs.md) | 6 |  | BASE TABLE |
 
 ## Relations

diff --git a/sample/postgres/hyphen-table.md b/sample/postgres/hyphen-table.md
@@ -0,0 +1,19 @@
+# hyphen-table
+
+## Description
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | uuid | uuid_generate_v4() | false |  |  |  |
+| hyphen-column | text |  | false |  |  |  |
+| created | timestamp without time zone |  | false |  |  |  |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/postgres/hyphen-table.png b/sample/postgres/hyphen-table.png
diff --git a/sample/postgres/schema.png b/sample/postgres/schema.png
diff --git a/sample/sqlite/README.md b/sample/sqlite/README.md
@@ -12,6 +12,7 @@
 | [logs](logs.md) | 7 | audit log table | table |
 | [post_comments](post_comments.md) | 7 | post and comments View table | view |
 | [CamelizeTable](CamelizeTable.md) | 2 |  | table |
+| [hyphen-table](hyphen-table.md) | 3 |  | table |
 | [check_constraints](check_constraints.md) | 6 |  | table |
 | [syslog](syslog.md) | 1 |  | virtual table |
 | [access_log](access_log.md) | 1 |  | virtual table |

diff --git a/sample/sqlite/hyphen-table.md b/sample/sqlite/hyphen-table.md
@@ -0,0 +1,38 @@
+# hyphen-table
+
+## Description
+
+<details>
+<summary><strong>Table Definition</strong></summary>
+
+```sql
+CREATE TABLE 'hyphen-table' (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  'hyphen-column' TEXT NOT NULL,
+  created NUMERIC NOT NULL
+)
+```
+
+</details>
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | INTEGER |  | true |  |  |  |
+| hyphen-column | TEXT |  | false |  |  |  |
+| created | NUMERIC |  | false |  |  |  |
+
+## Constraints
+
+| Name | Type | Definition |
+| ---- | ---- | ---------- |
+| id | PRIMARY KEY | PRIMARY KEY (id) |
+
+## Relations
+
+![er](hyphen-table.png)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)
diff --git a/sample/sqlite/hyphen-table.png b/sample/sqlite/hyphen-table.png
diff --git a/sample/sqlite/schema.png b/sample/sqlite/schema.png
diff --git a/sample/svg/README.md b/sample/svg/README.md
@@ -7,6 +7,7 @@
 | [CamelizeTable](CamelizeTable.md) | 2 |  | BASE TABLE |
 | [comment_stars](comment_stars.md) | 6 |  | BASE TABLE |
 | [comments](comments.md) | 6 | Comments<br>Multi-line<br>table<br>comment | BASE TABLE |
+| [hyphen-table](hyphen-table.md) | 3 |  | BASE TABLE |
 | [logs](logs.md) | 7 | audit log table | BASE TABLE |
 | [post_comments](post_comments.md) | 7 | post and comments View table | VIEW |
 | [posts](posts.md) | 7 | Posts table | BASE TABLE |

diff --git a/sample/svg/hyphen-table.md b/sample/svg/hyphen-table.md
@@ -0,0 +1,45 @@
+# hyphen-table
+
+## Description
+
+<details>
+<summary><strong>Table Definition</strong></summary>
+
+```sql
+CREATE TABLE `hyphen-table` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `hyphen-column` text NOT NULL,
+  `created` datetime NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+```
+
+</details>
+
+## Columns
+
+| Name | Type | Default | Nullable | Children | Parents | Comment |
+| ---- | ---- | ------- | -------- | -------- | ------- | ------- |
+| id | bigint(20) |  | false |  |  |  |
+| hyphen-column | text |  | false |  |  |  |
+| created | datetime |  | false |  |  |  |
+
+## Constraints
+
+| Name | Type | Definition |
+| ---- | ---- | ---------- |
+| PRIMARY | PRIMARY KEY | PRIMARY KEY (id) |
+
+## Indexes
+
+| Name | Definition |
+| ---- | ---------- |
+| PRIMARY | PRIMARY KEY (id) USING BTREE |
+
+## Relations
+
+![er](hyphen-table.svg)
+
+---
+
+> Generated by [tbls](https://github.com/k1LoW/tbls)