Merge pull request #17 from hymkor/push-qmwzrvpsvpwl

`desc` → `r` failed on MySQL

Author: hymkor

commands.go

@@ -139,7 +139,7 @@ func doDescTables(ctx context.Context, ss *session, commandIn commandIn) error {
 			rc, err := handler(e)
 			if err == nil && rc.Quit && name != "" {
 				action = func() error {
-					return doEdit(ctx, ss, `edit "`+name+`"`, commandIn)
+					return doEdit(ctx, ss, "edit "+ss.Dialect.EncloseIdentifier(name), commandIn)
 				}
 			}
 			return rc, err

dialect/main.go

@@ -53,6 +53,19 @@ type Entry struct {
 
 	// IsQuerySQL reports whether the given SQL statement is a query (e.g., SELECT) or not.
 	IsQuerySQL func(sql string) bool
+
+	// IdentifierEncloser encloses an identifier with dialect-specific quotes.
+	IdentifierEncloser func(name string) string
+}
+
+// EncloseIdentifier returns the given name enclosed with
+// dialect-specific quotes. If IdentifierEncloser is nil,
+// it defaults to using double quotes.
+func (D *Entry) EncloseIdentifier(name string) string {
+	if f := D.IdentifierEncloser; f != nil {
+		return f(name)
+	}
+	return `"` + name + `"`
 }
 
 func (D *Entry) LookupConverter(typeName string) func(string) (any, error) {

dialect/mysql/main.go

@@ -92,6 +92,10 @@ var mySqlSpec = &dialect.Entry{
 	DSNFilter:        mySQLDSNFilter,
 	TableNameField:   "TABLE_NAME",
 	ColumnNameField:  "NAME",
+
+	IdentifierEncloser: func(s string) string {
+		return "`" + s + "`"
+	},
 }
 
 func init() {

release_note_en.md

@@ -4,6 +4,7 @@
 
 - Fix: completion — cursor moved to the start of the previous word when the current word was empty (#15, [go-readline-ny #17](https://github.com/nyaosorg/go-readline-ny/pull/17))
 - Fix: an issue where pressing `Enter` on the result of the `desc` command (table list) did not show the column (`desc TABLE`) for the selected table on databases other than SQLite3. (#16)
+- Fix: In MySQL, pressing `r` on the table list failed to launch the `edit <table>` command because the table name was enclosed with a different type of quotation marks (`` ` ``) than other databases. (#17)
 
 ### Specification changes
 

release_note_ja.md

@@ -4,6 +4,7 @@
 
 - 補完で、現在の単語が空の場合にカーソルが前の単語の先頭に移動してしまう不具合を修正 (#15,[go-readline-ny v1.12.3 #17](https://github.com/nyaosorg/go-readline-ny/pull/17))
 - SQLite3 以外のデータベースで、引数なしのdesc コマンド（テーブル一覧）の中から `Enter` を押下して、該当行のテーブルのカラム一覧を表示できなかった不具合を修正  (#16)
+- MySQL で、テーブル一覧表示から、r を押下した時、テーブル名を囲むべき引用符が他のDBと違って `` ` `` だったため、`edit テーブル` コマンドが起動できなかった不具合を修正 (#17)
 
 ### 仕様変更