@@ -40,66 +40,66 @@ const (
4040var ConfigHelp = `Place holder. This will be replaced with details on config.yaml options`
4141
4242type 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
5252type 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
6666type 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
7272type 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
9090type DoltgresPerformanceConfig struct {
91- QueryParallelism * int `yaml:"query_parallelism,omitempty" minver:"TBD "`
91+ QueryParallelism * int `yaml:"query_parallelism,omitempty" minver:"0.7.4 "`
9292}
9393
9494type 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
100100type 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
105105type DoltgresUserSessionVars struct {
@@ -108,27 +108,27 @@ type DoltgresUserSessionVars struct {
108108}
109109
110110type 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
134134func (cfg * DoltgresConfig ) AutoCommit () bool {
0 commit comments