Merge pull request #75 from hymkor/push-vrtuwykuwyox

Support `DESC {OWNER}.{TABLE}` in MS SQL Server

Author: hymkor

CHANGELOG.md

@@ -10,7 +10,7 @@ Changelog (English)
 - Improved datetime handling in SELECT and EDIT operations. Columns without timezone information no longer display redundant timezone offsets, and fields without certain precision (such as seconds) no longer show unnecessary components. Datetime comparison and update matching are now performed using string representations appropriate for each column type. (#55, #57, #58, #65, #66, #69)
 - Improved readability of datetime values shown in bind variable output during edit operations. (#60)
 - Added support for Oracle TIMESTAMP WITH TIME ZONE / TIMESTAMP WITH LOCAL TIME ZONE and SQL Server DATETIMEOFFSET columns in edit mode. (#63, #66)
-- In MySQL, PostgreSQL and Oracle, `desc` supports `desc {schema}.{table}` syntax now (#68, #73, #74)
+- In MySQL, PostgreSQL, Oracle and MS SQL Server, `desc` supports `desc {schema}.{table}` syntax now (#68, #73, #74, #75)
 - Since the `edit` command now handles date/time values primarily as strings, SQL-Bless no longer needs to force MySQL drivers to return `time.Time` values. As a result, SQL-Bless no longer appends `&parseTime=true&loc=Local` to MySQL DSNs. (#71)
 - PostgreSQL: Improved table selection for the edit command. All accessible tables are now available as candidates, including those in `pg_catalog` and `information_schema`. System tables are listed after user tables, and schema-qualified names (schema.table) are displayed to avoid ambiguity. (#72)
 - Improve output of `desc` on PostgreSQL (#73)

CHANGELOG_ja.md

@@ -10,7 +10,7 @@ Changelog (Japanese)
 - SELECT / EDIT における日時表示を改善。タイムゾーン情報を持たないカラムでは不要なタイムゾーン表示を行わないようにし、精度を持たない項目（例: 秒）も表示しないようにした。日時比較や更新時の照合も、各カラム型に応じた文字列形式で行うよう改善した。(#55, #57, #58, #65, #66, #69)
 - edit 文のバインド変数出力における日時表示の読み易さを改善した。 (#60)
 - edit 文で Oracle TIMESTAMP WITH TIME ZONE / TIMESTAMP WITH LOCAL TIME ZONE および SQL Server DATETIMEOFFSET 型をサポートした。 (#63, #66)
-- MySQL, PostgreSQL, Oracle の desc 文で `desc {スキーマ名}.{テーブル名}` をサポート (#68, #73, #74)
+- MySQL, PostgreSQL, Oracle, MS SQL Server の desc 文で `desc {スキーマ名}.{テーブル名}` をサポート (#68, #73, #74, #75)
 - `edit` 文で日時をあくまで文字列ベースで扱うようにした結果、time.Time の使用を MySQL ドライバーパッケージに指定する必要がなくなったため、`&parseTime=True&loc=Local` を DSN 文字列に追記するのをやめた (#71)
 - PostgreSQL で edit コマンドでのテーブル選択を改善した。`pg_catalog` と `information_schema` も含め、アクセスできる全テーブルを候補にできるようにした。システムテーブルはユーザテーブルの後でリストするようにし、あいまいにならないようにスキーマ修飾子(schema.table)も表示するようにした (#72)
 - PostgreSQL の desc コマンドの出力を改善 (#73)

dialect/sqlserver/columns.sql

@@ -0,0 +1,36 @@
+select  c.column_id as "ID",
+        c.name as "NAME",
+        case c.is_nullable
+            when 1 then 'NULL'
+            else 'NOT NULL'
+        end as "NULL?",
+        case
+            when t.name in ('char','varchar','nchar','nvarchar',
+                            'binary','varbinary')
+             and c.max_length > 0
+            then t.name + '(' +
+                 convert(varchar,
+                    case
+                        when t.name in ('nchar','nvarchar')
+                        then c.max_length/2
+                        else c.max_length
+                    end
+                 ) + ')'
+             else t.name
+        end as "TYPE"
+  from  sys.columns c,
+        sys.objects o,
+        sys.types   t,
+        sys.schemas s
+ where  c.object_id = o.object_id
+   and  o.name = case
+            when @p1 like '%.%' then parsename(@p1,1)
+            else @p1
+        end
+   and  o.schema_id = s.schema_id
+   and  s.name = case
+            when @p1 like '%.%' then parsename(@p1,2)
+            else schema_name()
+        end
+   and  c.user_type_id = t.user_type_id
+ order  by c.column_id

dialect/sqlserver/main.go

@@ -1,6 +1,7 @@
 package sqlserver
 
 import (
+	_ "embed"
 	"time"
 
 	_ "github.com/microsoft/go-mssqldb"
@@ -10,6 +11,9 @@ import (
 	"github.com/hymkor/sqlbless/dialect"
 )
 
+//go:embed columns.sql
+var columnSql string
+
 var typeSpec = map[string][2]string{
 	"DATE": {
 		"CAST(@v%d AS DATE)",
@@ -61,27 +65,8 @@ func formatValue(typeName string, value any) (string, bool) {
 }
 
 var sqlServerSpec = &dialect.Entry{
-	Usage: "sqlbless sqlserver://@<HOSTNAME>?database=<DBNAME>",
-	SQLForColumns: `
-	select c.column_id as "ID",
-		   c.name as "NAME",
-		   case
-			 when c.max_length > 0 then
-			   t.name + '(' + convert(varchar,c.max_length) + ')'
-			 else
-			   t.name
-		   end as "TYPE",
-		   case c.is_nullable
-			 when 1 then 'NULL'
-			 else 'NOT NULL'
-		   end as "NULL?"
-	  from sys.columns c,
-		   sys.objects o,
-		   sys.types t
-	 where c.object_id = o.object_id
-	   and o.name = @p1
-	   and c.user_type_id = t.user_type_id
-	 order by c.column_id`,
+	Usage:            "sqlbless sqlserver://@<HOSTNAME>?database=<DBNAME>",
+	SQLForColumns:    columnSql,
 	SQLForTables:     `select * from sys.tables`,
 	TypeConverterFor: typeNameToConv,
 	PlaceHolder:      &dialect.PlaceHolderName{Mark: "@", Prefix: "v"},