Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.SetDbCharset = mustParseConfig(t, "").SetDbCharset

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.SetDbCharset = 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()

Expand Down
9 changes: 7 additions & 2 deletions fbconn/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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": {},
Expand Down
1 change: 1 addition & 0 deletions fbconn/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions fbconn/defaults_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions fbconn/fbconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,12 @@ connectLoop:
dpb.PutInt32(fbproto.Isc_dpb_sql_dialect, 3)
if config.CreateDatabase {
dpb.PutInt32(fbproto.Isc_dpb_set_db_sql_dialect, 3)
_, 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 != "" {
Expand Down