Merge pull request #2448 from DengChan/column_type_lenth_varbit

jackc · web-flow · commit 2cf78dd90660 · 2025-12-26T08:44:13.000-06:00
ColumnTypeLength method return the type length for varbit type.
diff --git a/stdlib/sql.go b/stdlib/sql.go
@@ -664,6 +664,8 @@ func (r *Rows) ColumnTypeLength(index int) (int64, bool) {
 		return math.MaxInt64, true
 	case pgtype.VarcharOID, pgtype.BPCharArrayOID:
 		return int64(fd.TypeModifier - varHeaderSize), true
+	case pgtype.VarbitOID:
+		return int64(fd.TypeModifier), true	
 	default:
 		return 0, false
 	}
diff --git a/stdlib/sql_test.go b/stdlib/sql_test.go
@@ -1403,3 +1403,67 @@ func TestOptionShouldPing_HookCalledOnReuse(t *testing.T) {
 
 	require.True(t, hookCalled, "hook should be called on reuse")
 }
+
+func TestRowsColumnTypeLength(t *testing.T) {
+	testWithAllQueryExecModes(t, func(t *testing.T, db *sql.DB) {
+		columnTypeLengthTests := []struct {
+			Len int64
+			OK  bool
+		}{
+			{
+				math.MaxInt64,
+				true,
+			},
+			{
+				math.MaxInt64,
+				true,
+			},
+			{
+				255,
+				true,
+			},
+			{
+				10,
+				true,
+			},
+			{
+				50,
+				true,
+			},
+			{
+				0,
+				false,
+			},
+		}
+
+		_, err := db.Exec(`CREATE TEMPORARY TABLE temp_column_type_length (
+						   text_column TEXT,
+						   bytea_column BYTEA,
+						   varchar_column VARCHAR(255),
+						   bpcharA_column BPCHAR(10)[],
+						   varbit_column VARBIT(50),
+						   int_column INT
+					);`)
+		require.NoError(t, err)
+
+		rows, err := db.Query("SELECT * FROM temp_column_type_length")
+		require.NoError(t, err)
+
+		columns, err := rows.ColumnTypes()
+		require.NoError(t, err)
+		assert.Len(t, columns, 6)
+
+		for i, tt := range columnTypeLengthTests {
+			c := columns[i]
+
+			l, ok := c.Length()
+			if l != tt.Len {
+				t.Errorf("(%d) got: %d, want: %d", i, l, tt.Len)
+			}
+			if ok != tt.OK {
+				t.Errorf("(%d) got: %t, want: %t", i, ok, tt.OK)
+			}
+
+		}
+	})
+}

Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,8 @@ func (r *Rows) ColumnTypeLength(index int) (int64, bool) {`
`664`	`664`	`return math.MaxInt64, true`
`665`	`665`	`case pgtype.VarcharOID, pgtype.BPCharArrayOID:`
`666`	`666`	`return int64(fd.TypeModifier - varHeaderSize), true`
	`667`	`+ case pgtype.VarbitOID:`
	`668`	`+ return int64(fd.TypeModifier), true`
`667`	`669`	`default:`
`668`	`670`	`return 0, false`
`669`	`671`	`}`