fix: test failures

Author: chriswessels

db_proto/sql/risingwave/database_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/streamingfast/substreams-sink-sql/internal/timefmt"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -30,6 +31,8 @@ func TestTableName(t *testing.T) {
 
 // Test value conversion for RisingWave-specific handling
 func TestValueConversion(t *testing.T) {
+	timeValue := time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC)
+
 	tests := []struct {
 		name     string
 		input    interface{}
@@ -41,7 +44,7 @@ func TestValueConversion(t *testing.T) {
 		{"uint64", uint64(456), "456"},
 		{"bool true", true, "true"},
 		{"bool false", false, "false"},
-		{"time", time.Date(2023, 1, 1, 0, 0, 0, 0, time.UTC), "'2023-01-01 00:00:00.000000+00:00'"},
+		{"time", timeValue, "'" + timefmt.FormatRisingWave(timeValue) + "'"},
 		{"bytes", []byte{0xDE, 0xAD}, "'\\xDEAD'"},
 	}
 

db_proto/sql/risingwave/types_test.go

@@ -46,7 +46,7 @@ func TestValueToString(t *testing.T) {
 		{"empty bytes", []uint8{}, "'\\x'"},
 
 		// Time values
-		{"time", time.Date(2023, 1, 15, 10, 30, 0, 0, time.UTC), "'2023-01-15 10:30:00.000000+00:00'"},
+		{"time", time.Date(2023, 1, 15, 10, 30, 0, 0, time.UTC), "'" + timefmt.FormatRisingWave(time.Date(2023, 1, 15, 10, 30, 0, 0, time.UTC)) + "'"},
 	}
 
 	for _, tt := range tests {
@@ -62,7 +62,7 @@ func TestValueToStringTimestamp(t *testing.T) {
 	testTime := time.Date(2023, 1, 15, 10, 30, 0, 0, time.UTC)
 	pbTime := timestamppb.New(testTime)
 	result := ValueToString(pbTime)
-	assert.Equal(t, "'2023-01-15 10:30:00.000000+00:00'", result)
+	assert.Equal(t, "'"+timefmt.FormatRisingWave(testTime)+"'", result)
 
 	// Non-UTC timestamp should be converted to UTC before formatting
 	nonUTCTime := time.Date(2023, 1, 15, 10, 30, 0, 987000000, time.FixedZone("UTC-5", -5*3600))

internal/timefmt/risingwave.go

@@ -1,15 +1,18 @@
 package timefmt
 
-import "time"
+import (
+	"fmt"
+	"time"
+)
 
-// RisingWaveTimestampLayout is the canonical layout accepted by RisingWave for timestamptz values.
-// RisingWave rejects RFC3339 timestamps with the 'T' separator, so we normalize to the layout
-// "YYYY-MM-DD HH:MM:SS[.up to 6 digits]±HH:MM".
-const RisingWaveTimestampLayout = "2006-01-02 15:04:05.999999Z07:00"
-
-// FormatRisingWave returns the UTC representation of t formatted according to
-// RisingWaveTimestampLayout. RisingWave expects timestamps with a space separator
-// between the date and the time component and supports microsecond precision.
+// FormatRisingWave renders a UTC timestamp in the layout accepted by RisingWave
+// ("YYYY-MM-DD HH:MM:SS[.dddddd]+HH:MM"), always returning a space separator and
+// microsecond precision when sub-second data is present.
 func FormatRisingWave(t time.Time) string {
-	return t.UTC().Format(RisingWaveTimestampLayout)
+	utc := t.UTC()
+	base := utc.Format("2006-01-02 15:04:05")
+	if ns := utc.Nanosecond(); ns != 0 {
+		base = fmt.Sprintf("%s.%06d", base, ns/1000)
+	}
+	return base + "+00:00"
 }