Skip to content

Commit 2263061

Browse files
committed
Update DoltgreSQL version to 0.7.4
1 parent e0ee3ed commit 2263061

File tree

3 files changed

+90
-48
lines changed

3 files changed

+90
-48
lines changed

server/config.go

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -40,66 +40,66 @@ const (
4040
var ConfigHelp = `Place holder. This will be replaced with details on config.yaml options`
4141

4242
type PostgresReplicationConfig struct {
43-
PostgresServerAddress *string `yaml:"postgres_server_address,omitempty" minver:"TBD"`
44-
PostgresUser *string `yaml:"postgres_user,omitempty" minver:"TBD"`
45-
PostgresPassword *string `yaml:"postgres_password,omitempty" minver:"TBD"`
46-
PostgresDatabase *string `yaml:"postgres_database,omitempty" minver:"TBD"`
47-
PostgresPort *int `yaml:"postgres_port,omitempty" minver:"TBD"`
48-
SlotName *string `yaml:"slot_name,omitempty" minver:"TBD"`
43+
PostgresServerAddress *string `yaml:"postgres_server_address,omitempty" minver:"0.7.4"`
44+
PostgresUser *string `yaml:"postgres_user,omitempty" minver:"0.7.4"`
45+
PostgresPassword *string `yaml:"postgres_password,omitempty" minver:"0.7.4"`
46+
PostgresDatabase *string `yaml:"postgres_database,omitempty" minver:"0.7.4"`
47+
PostgresPort *int `yaml:"postgres_port,omitempty" minver:"0.7.4"`
48+
SlotName *string `yaml:"slot_name,omitempty" minver:"0.7.4"`
4949
}
5050

5151
// BehaviorYAMLConfig contains server configuration regarding how the server should behave
5252
type DoltgresBehaviorConfig struct {
53-
ReadOnly *bool `yaml:"read_only,omitempty" minver:"TBD"`
53+
ReadOnly *bool `yaml:"read_only,omitempty" minver:"0.7.4"`
5454
// Disable processing CLIENT_MULTI_STATEMENTS support on the
5555
// sql server. Dolt's handling of CLIENT_MULTI_STATEMENTS is currently
5656
// broken. If a client advertises to support it (mysql cli client
5757
// does), and then sends statements that contain embedded unquoted ';'s
5858
// (such as a CREATE TRIGGER), then those incoming queries will be
5959
// misprocessed.
60-
DisableClientMultiStatements *bool `yaml:"disable_client_multi_statements,omitempty" minver:"TBD"`
60+
DisableClientMultiStatements *bool `yaml:"disable_client_multi_statements,omitempty" minver:"0.7.4"`
6161
// DoltTransactionCommit enables the @@dolt_transaction_commit system variable, which
6262
// automatically creates a Dolt commit when any SQL transaction is committed.
63-
DoltTransactionCommit *bool `yaml:"dolt_transaction_commit,omitempty" minver:"TBD"`
63+
DoltTransactionCommit *bool `yaml:"dolt_transaction_commit,omitempty" minver:"0.7.4"`
6464
}
6565

6666
type DoltgresUserConfig struct {
67-
Name *string `yaml:"name,omitempty" minver:"TBD"`
68-
Password *string `yaml:"password,omitempty" minver:"TBD"`
67+
Name *string `yaml:"name,omitempty" minver:"0.7.4"`
68+
Password *string `yaml:"password,omitempty" minver:"0.7.4"`
6969
}
7070

7171
// DoltgresListenerConfig contains information on the network connection that the server will open
7272
type DoltgresListenerConfig struct {
73-
HostStr *string `yaml:"host,omitempty" minver:"TBD"`
74-
PortNumber *int `yaml:"port,omitempty" minver:"TBD"`
75-
ReadTimeoutMillis *uint64 `yaml:"read_timeout_millis,omitempty" minver:"TBD"`
76-
WriteTimeoutMillis *uint64 `yaml:"write_timeout_millis,omitempty" minver:"TBD"`
73+
HostStr *string `yaml:"host,omitempty" minver:"0.7.4"`
74+
PortNumber *int `yaml:"port,omitempty" minver:"0.7.4"`
75+
ReadTimeoutMillis *uint64 `yaml:"read_timeout_millis,omitempty" minver:"0.7.4"`
76+
WriteTimeoutMillis *uint64 `yaml:"write_timeout_millis,omitempty" minver:"0.7.4"`
7777
// TLSKey is a file system path to an unencrypted private TLS key in PEM format.
78-
TLSKey *string `yaml:"tls_key,omitempty" minver:"TBD"`
78+
TLSKey *string `yaml:"tls_key,omitempty" minver:"0.7.4"`
7979
// TLSCert is a file system path to a TLS certificate chain in PEM format.
80-
TLSCert *string `yaml:"tls_cert,omitempty" minver:"TBD"`
80+
TLSCert *string `yaml:"tls_cert,omitempty" minver:"0.7.4"`
8181
// RequireSecureTransport can enable a mode where non-TLS connections are turned away.
82-
RequireSecureTransport *bool `yaml:"require_secure_transport,omitempty" minver:"TBD"`
82+
RequireSecureTransport *bool `yaml:"require_secure_transport,omitempty" minver:"0.7.4"`
8383
// AllowCleartextPasswords enables use of cleartext passwords.
84-
AllowCleartextPasswords *bool `yaml:"allow_cleartext_passwords,omitempty" minver:"TBD"`
84+
AllowCleartextPasswords *bool `yaml:"allow_cleartext_passwords,omitempty" minver:"0.7.4"`
8585
// Socket is unix socket file path
86-
Socket *string `yaml:"socket,omitempty" minver:"TBD"`
86+
Socket *string `yaml:"socket,omitempty" minver:"0.7.4"`
8787
}
8888

8989
// DoltgresPerformanceConfig contains configuration parameters for performance tweaking
9090
type DoltgresPerformanceConfig struct {
91-
QueryParallelism *int `yaml:"query_parallelism,omitempty" minver:"TBD"`
91+
QueryParallelism *int `yaml:"query_parallelism,omitempty" minver:"0.7.4"`
9292
}
9393

9494
type DoltgesMetricsConfig struct {
95-
Labels map[string]string `yaml:"labels,omitempty" minver:"TBD"`
96-
Host *string `yaml:"host,omitempty" minver:"TBD"`
97-
Port *int `yaml:"port,omitempty" minver:"TBD"`
95+
Labels map[string]string `yaml:"labels,omitempty" minver:"0.7.4"`
96+
Host *string `yaml:"host,omitempty" minver:"0.7.4"`
97+
Port *int `yaml:"port,omitempty" minver:"0.7.4"`
9898
}
9999

100100
type DoltgresRemotesapiConfig struct {
101-
Port *int `yaml:"port,omitempty" minver:"TBD"`
102-
ReadOnly *bool `yaml:"read_only,omitempty" minver:"TBD"`
101+
Port *int `yaml:"port,omitempty" minver:"0.7.4"`
102+
ReadOnly *bool `yaml:"read_only,omitempty" minver:"0.7.4"`
103103
}
104104

105105
type DoltgresUserSessionVars struct {
@@ -108,27 +108,27 @@ type DoltgresUserSessionVars struct {
108108
}
109109

110110
type DoltgresConfig struct {
111-
LogLevelStr *string `yaml:"log_level,omitempty" minver:"TBD"`
112-
MaxLenInLogs *int `yaml:"max_query_len_in_logs,omitempty" minver:"TBD"`
113-
EncodeLoggedQuery *bool `yaml:"encode_logged_query,omitempty" minver:"TBD"`
114-
BehaviorConfig *DoltgresBehaviorConfig `yaml:"behavior,omitempty" minver:"TBD"`
115-
UserConfig *DoltgresUserConfig `yaml:"user,omitempty" minver:"TBD"`
116-
ListenerConfig *DoltgresListenerConfig `yaml:"listener,omitempty" minver:"TBD"`
117-
PerformanceConfig *DoltgresPerformanceConfig `yaml:"performance,omitempty" minver:"TBD"`
118-
DataDirStr *string `yaml:"data_dir,omitempty" minver:"TBD"`
119-
CfgDirStr *string `yaml:"cfg_dir,omitempty" minver:"TBD"`
120-
MetricsConfig *DoltgesMetricsConfig `yaml:"metrics,omitempty" minver:"TBD"`
121-
RemotesapiConfig *DoltgresRemotesapiConfig `yaml:"remotesapi,omitempty" minver:"TBD"`
122-
PrivilegeFile *string `yaml:"privilege_file,omitempty" minver:"TBD"`
123-
BranchControlFile *string `yaml:"branch_control_file,omitempty" minver:"TBD"`
111+
LogLevelStr *string `yaml:"log_level,omitempty" minver:"0.7.4"`
112+
MaxLenInLogs *int `yaml:"max_query_len_in_logs,omitempty" minver:"0.7.4"`
113+
EncodeLoggedQuery *bool `yaml:"encode_logged_query,omitempty" minver:"0.7.4"`
114+
BehaviorConfig *DoltgresBehaviorConfig `yaml:"behavior,omitempty" minver:"0.7.4"`
115+
UserConfig *DoltgresUserConfig `yaml:"user,omitempty" minver:"0.7.4"`
116+
ListenerConfig *DoltgresListenerConfig `yaml:"listener,omitempty" minver:"0.7.4"`
117+
PerformanceConfig *DoltgresPerformanceConfig `yaml:"performance,omitempty" minver:"0.7.4"`
118+
DataDirStr *string `yaml:"data_dir,omitempty" minver:"0.7.4"`
119+
CfgDirStr *string `yaml:"cfg_dir,omitempty" minver:"0.7.4"`
120+
MetricsConfig *DoltgesMetricsConfig `yaml:"metrics,omitempty" minver:"0.7.4"`
121+
RemotesapiConfig *DoltgresRemotesapiConfig `yaml:"remotesapi,omitempty" minver:"0.7.4"`
122+
PrivilegeFile *string `yaml:"privilege_file,omitempty" minver:"0.7.4"`
123+
BranchControlFile *string `yaml:"branch_control_file,omitempty" minver:"0.7.4"`
124124

125125
// TODO: Rename to UserVars_
126-
Vars []DoltgresUserSessionVars `yaml:"user_session_vars,omitempty" minver:"TBD"`
127-
SystemVariables *engine.SystemVariables `yaml:"system_variables,omitempty" minver:"TBD"`
128-
Jwks []engine.JwksConfig `yaml:"jwks,omitempty" minver:"TBD"`
129-
GoldenMysqlConn *string `yaml:"golden_mysql_conn,omitempty" minver:"TBD"`
126+
Vars []DoltgresUserSessionVars `yaml:"user_session_vars,omitempty" minver:"0.7.4"`
127+
SystemVariables *engine.SystemVariables `yaml:"system_variables,omitempty" minver:"0.7.4"`
128+
Jwks []engine.JwksConfig `yaml:"jwks,omitempty" minver:"0.7.4"`
129+
GoldenMysqlConn *string `yaml:"golden_mysql_conn,omitempty" minver:"0.7.4"`
130130

131-
PostgresReplicationConfig *PostgresReplicationConfig `yaml:"postgres_replication,omitempty" minver:"TBD"`
131+
PostgresReplicationConfig *PostgresReplicationConfig `yaml:"postgres_replication,omitempty" minver:"0.7.4"`
132132
}
133133

134134
func (cfg *DoltgresConfig) AutoCommit() bool {

server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
)
4141

4242
const (
43-
Version = "0.7.0"
43+
Version = "0.7.4"
4444

4545
// DOLTGRES_DATA_DIR is an environment variable that defines the location of DoltgreSQL databases
4646
DOLTGRES_DATA_DIR = "DOLTGRES_DATA_DIR"
Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,53 @@
11
# file automatically updated by the release process.
22
# if you are getting an error with this file it's likely you
33
# have added a new minver tag with a value other than TBD
4-
Vars []server.DoltgresUserSessionVars TBD user_session_vars,omitempty
4+
LogLevelStr *string 0.7.4 log_level,omitempty
5+
MaxLenInLogs *int 0.7.4 max_query_len_in_logs,omitempty
6+
EncodeLoggedQuery *bool 0.7.4 encode_logged_query,omitempty
7+
BehaviorConfig *server.DoltgresBehaviorConfig 0.7.4 behavior,omitempty
8+
-ReadOnly *bool 0.7.4 read_only,omitempty
9+
-DisableClientMultiStatements *bool 0.7.4 disable_client_multi_statements,omitempty
10+
-DoltTransactionCommit *bool 0.7.4 dolt_transaction_commit,omitempty
11+
UserConfig *server.DoltgresUserConfig 0.7.4 user,omitempty
12+
-Name *string 0.7.4 name,omitempty
13+
-Password *string 0.7.4 password,omitempty
14+
ListenerConfig *server.DoltgresListenerConfig 0.7.4 listener,omitempty
15+
-HostStr *string 0.7.4 host,omitempty
16+
-PortNumber *int 0.7.4 port,omitempty
17+
-ReadTimeoutMillis *uint64 0.7.4 read_timeout_millis,omitempty
18+
-WriteTimeoutMillis *uint64 0.7.4 write_timeout_millis,omitempty
19+
-TLSKey *string 0.7.4 tls_key,omitempty
20+
-TLSCert *string 0.7.4 tls_cert,omitempty
21+
-RequireSecureTransport *bool 0.7.4 require_secure_transport,omitempty
22+
-AllowCleartextPasswords *bool 0.7.4 allow_cleartext_passwords,omitempty
23+
-Socket *string 0.7.4 socket,omitempty
24+
PerformanceConfig *server.DoltgresPerformanceConfig 0.7.4 performance,omitempty
25+
-QueryParallelism *int 0.7.4 query_parallelism,omitempty
26+
DataDirStr *string 0.7.4 data_dir,omitempty
27+
CfgDirStr *string 0.7.4 cfg_dir,omitempty
28+
MetricsConfig *server.DoltgesMetricsConfig 0.7.4 metrics,omitempty
29+
-Labels map[string]string 0.7.4 labels,omitempty
30+
-Host *string 0.7.4 host,omitempty
31+
-Port *int 0.7.4 port,omitempty
32+
RemotesapiConfig *server.DoltgresRemotesapiConfig 0.7.4 remotesapi,omitempty
33+
-Port *int 0.7.4 port,omitempty
34+
-ReadOnly *bool 0.7.4 read_only,omitempty
35+
PrivilegeFile *string 0.7.4 privilege_file,omitempty
36+
BranchControlFile *string 0.7.4 branch_control_file,omitempty
37+
Vars []server.DoltgresUserSessionVars 0.7.4 user_session_vars,omitempty
538
-Name string 0.0.0 name
639
-Vars map[string]string 0.0.0 vars,omitempty
7-
Jwks []engine.JwksConfig TBD jwks,omitempty
40+
SystemVariables *engine.SystemVariables 0.7.4 system_variables,omitempty
41+
Jwks []engine.JwksConfig 0.7.4 jwks,omitempty
842
-Name string 0.0.0 name
943
-LocationUrl string 0.0.0 location_url
1044
-Claims map[string]string 0.0.0 claims
11-
-FieldsToLog []string 0.0.0 fields_to_log
45+
-FieldsToLog []string 0.0.0 fields_to_log
46+
GoldenMysqlConn *string 0.7.4 golden_mysql_conn,omitempty
47+
PostgresReplicationConfig *server.PostgresReplicationConfig 0.7.4 postgres_replication,omitempty
48+
-PostgresServerAddress *string 0.7.4 postgres_server_address,omitempty
49+
-PostgresUser *string 0.7.4 postgres_user,omitempty
50+
-PostgresPassword *string 0.7.4 postgres_password,omitempty
51+
-PostgresDatabase *string 0.7.4 postgres_database,omitempty
52+
-PostgresPort *int 0.7.4 postgres_port,omitempty
53+
-SlotName *string 0.7.4 slot_name,omitempty

0 commit comments

Comments
 (0)