From bd1002e4f1a443f3251f19f6417abaaee28529a4 Mon Sep 17 00:00:00 2001 From: Matvey Gubanikhin Date: Thu, 19 Nov 2026 09:14:49 +0300 Subject: [PATCH 1/2] Specify charset when creating database. --- conn_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ fbconn/fbconn.go | 1 + 2 files changed, 45 insertions(+) diff --git a/conn_test.go b/conn_test.go index 60cf4eda..7f8834ba 100644 --- a/conn_test.go +++ b/conn_test.go @@ -79,6 +79,50 @@ func TestCreateDatabase(t *testing.T) { assert.Equal(t, int32(1), result) } +func TestCreateDatabaseDefaultEncoding(t *testing.T) { + t.Parallel() + + ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second) + defer cancel() + + config := newCreateDatabaseTestConfig(t, "default-encoding.fdb") + config.Encoding = mustParseConfig(t, "").Encoding + + conn, err := fbx.CreateDatabaseConfig(ctx, config) + require.NoError(t, err) + defer closeConn(t, conn) + + var encoding string + err = conn.QueryRow(ctx, "select trim(rdb$character_set_name) from rdb$database").Scan(&encoding) + require.NoError(t, err) + assert.Equal(t, "UTF8", encoding) +} + +func TestCreateDatabaseWithEncoding(t *testing.T) { + t.Parallel() + + for _, encoding := range []string{"UTF8", "NONE", "ASCII", "UNICODE_FSS"} { + t.Run(encoding, func(t *testing.T) { + t.Parallel() + + ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second) + defer cancel() + + config := newCreateDatabaseTestConfig(t, "with-encoding.fdb") + config.Encoding = encoding + + conn, err := fbx.CreateDatabaseConfig(ctx, config) + require.NoError(t, err) + defer closeConn(t, conn) + + var actualEncoding string + err = conn.QueryRow(ctx, "select trim(rdb$character_set_name) from rdb$database").Scan(&actualEncoding) + require.NoError(t, err) + assert.Equal(t, encoding, actualEncoding) + }) + } +} + func TestDropDatabase(t *testing.T) { t.Parallel() diff --git a/fbconn/fbconn.go b/fbconn/fbconn.go index 3c0d2e2a..94793cbb 100644 --- a/fbconn/fbconn.go +++ b/fbconn/fbconn.go @@ -889,6 +889,7 @@ connectLoop: dpb.PutInt32(fbproto.Isc_dpb_sql_dialect, 3) if config.CreateDatabase { dpb.PutInt32(fbproto.Isc_dpb_set_db_sql_dialect, 3) + dpb.PutString(fbproto.Isc_dpb_set_db_charset, config.Encoding) } dpb.PutString(fbproto.Isc_dpb_lc_ctype, config.Encoding) if config.User != "" { From e6d592e83df35190b7619aceee0a74509c9ae62c Mon Sep 17 00:00:00 2001 From: Matvey Gubanikhin Date: Thu, 19 Nov 2026 15:34:35 +0300 Subject: [PATCH 2/2] Add separate setting for encoding of database being created. --- conn_test.go | 4 ++-- fbconn/config.go | 9 +++++++-- fbconn/defaults.go | 1 + fbconn/defaults_windows.go | 1 + fbconn/fbconn.go | 7 ++++++- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/conn_test.go b/conn_test.go index 7f8834ba..b1114bf1 100644 --- a/conn_test.go +++ b/conn_test.go @@ -86,7 +86,7 @@ func TestCreateDatabaseDefaultEncoding(t *testing.T) { defer cancel() config := newCreateDatabaseTestConfig(t, "default-encoding.fdb") - config.Encoding = mustParseConfig(t, "").Encoding + config.SetDbCharset = mustParseConfig(t, "").SetDbCharset conn, err := fbx.CreateDatabaseConfig(ctx, config) require.NoError(t, err) @@ -109,7 +109,7 @@ func TestCreateDatabaseWithEncoding(t *testing.T) { defer cancel() config := newCreateDatabaseTestConfig(t, "with-encoding.fdb") - config.Encoding = encoding + config.SetDbCharset = encoding conn, err := fbx.CreateDatabaseConfig(ctx, config) require.NoError(t, err) diff --git a/fbconn/config.go b/fbconn/config.go index fd37e524..8b92695a 100644 --- a/fbconn/config.go +++ b/fbconn/config.go @@ -44,8 +44,11 @@ type Config struct { WireCrypt bool // WireCompression requests zlib wire compression. // The connection remains uncompressed if the server declines the request. - WireCompression bool - Encoding string + WireCompression bool + Encoding string + // Stores the character set that should be passed when creating the database. + // Default value is UTF8. + SetDbCharset string DPB []byte ClientVersion string DefaultTransactionReadOnly bool @@ -356,6 +359,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con SystemHost: settings["system_host"], ClientVersion: settings["client_version"], Encoding: settings["encoding"], + SetDbCharset: settings["set_db_charset"], DefaultTransactionReadOnly: convertToBool(settings["default_transaction_read_only"], false), Autocommit: convertToBool(settings["autocommit"], true), UseStreamBlobs: convertToBool(settings["use_stream_blobs"], true), @@ -426,6 +430,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con "system_host": {}, "client_version": {}, "encoding": {}, + "set_db_charset": {}, "default_transaction_read_only": {}, "autocommit": {}, "blob_buffer_size": {}, diff --git a/fbconn/defaults.go b/fbconn/defaults.go index 0abd52c5..1e3f18be 100644 --- a/fbconn/defaults.go +++ b/fbconn/defaults.go @@ -25,6 +25,7 @@ func defaultSettings() map[string]string { settings["wire_crypt"] = "true" settings["wire_compression"] = "false" settings["encoding"] = "UTF8" + settings["set_db_charset"] = "UTF8" settings["blob_buffer_size"] = "16384" settings["use_stream_blobs"] = "true" settings["max_inline_blob_size"] = "65536" diff --git a/fbconn/defaults_windows.go b/fbconn/defaults_windows.go index a0e8cb2b..0465b983 100644 --- a/fbconn/defaults_windows.go +++ b/fbconn/defaults_windows.go @@ -24,6 +24,7 @@ func defaultSettings() map[string]string { settings["wire_crypt"] = "true" settings["wire_compression"] = "false" settings["encoding"] = "UTF8" + settings["set_db_charset"] = "UTF8" settings["blob_buffer_size"] = "16384" settings["use_stream_blobs"] = "true" settings["max_inline_blob_size"] = "65536" diff --git a/fbconn/fbconn.go b/fbconn/fbconn.go index 94793cbb..3cf431ac 100644 --- a/fbconn/fbconn.go +++ b/fbconn/fbconn.go @@ -889,7 +889,12 @@ connectLoop: dpb.PutInt32(fbproto.Isc_dpb_sql_dialect, 3) if config.CreateDatabase { dpb.PutInt32(fbproto.Isc_dpb_set_db_sql_dialect, 3) - dpb.PutString(fbproto.Isc_dpb_set_db_charset, config.Encoding) + _, err := fbproto.NewEncoding(config.SetDbCharset) + if err != nil { + _ = fbConn.conn.Close() + return nil, newPerDialConnectError("database creation error", err) + } + dpb.PutString(fbproto.Isc_dpb_set_db_charset, config.SetDbCharset) } dpb.PutString(fbproto.Isc_dpb_lc_ctype, config.Encoding) if config.User != "" {