Commitd6c2835

authored

Merge pull request#1110 from chandr-andr/feature/add_read_only_session_attr

Add `ReadOnly` in `TargetSessionAttrs`

2 parentsba1b4cf +6a01730 commitd6c2835Copy full SHA for d6c2835

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ pub enum TargetSessionAttrs {`
`34`	`34`	`Any,`
`35`	`35`	`/// The session must allow writes.`
`36`	`36`	`ReadWrite,`
	`37`	`+/// The session allow only reads.`
	`38`	`+ReadOnly,`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`/// TLS configuration.`
`@@ -622,6 +624,7 @@ impl Config {`
`622`	`624`	`let target_session_attrs =match value{`
`623`	`625`	`"any" =>TargetSessionAttrs::Any,`
`624`	`626`	`"read-write" =>TargetSessionAttrs::ReadWrite,`
	`627`	`+"read-only" =>TargetSessionAttrs::ReadOnly,`
`625`	`628`	`_ =>{`
`626`	`629`	`returnErr(Error::config_parse(Box::new(InvalidValue(`
`627`	`630`	`"target_session_attrs",`

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ where`
`160`	`160`	`let has_hostname = hostname.is_some();`
`161`	`161`	`let(mut client,mut connection) =connect_raw(socket, tls, has_hostname, config).await?;`
`162`	`162`
`163`		`-ifletTargetSessionAttrs::ReadWrite = config.target_session_attrs{`
	`163`	`+ifconfig.target_session_attrs !=TargetSessionAttrs::Any{`
`164`	`164`	`let rows = client.simple_query_raw("SHOW transaction_read_only");`
`165`	`165`	`pin_mut!(rows);`
`166`	`166`
`@@ -185,11 +185,21 @@ where`
`185`	`185`
`186`	`186`	`match next.await.transpose()?{`
`187`	`187`	`Some(SimpleQueryMessage::Row(row)) =>{`
`188`		`-if row.try_get(0)? ==Some("on"){`
	`188`	`+let read_only_result = row.try_get(0)?;`
	`189`	`+if read_only_result ==Some("on")`
	`190`	`+ && config.target_session_attrs ==TargetSessionAttrs::ReadWrite`
	`191`	`+{`
`189`	`192`	`returnErr(Error::connect(io::Error::new(`
`190`	`193`	`io::ErrorKind::PermissionDenied,`
`191`	`194`	`"database does not allow writes",`
`192`	`195`	`)));`
	`196`	`+}elseif read_only_result ==Some("off")`
	`197`	`+ && config.target_session_attrs ==TargetSessionAttrs::ReadOnly`
	`198`	`+{`
	`199`	`+returnErr(Error::connect(io::Error::new(`
	`200`	`+ io::ErrorKind::PermissionDenied,`
	`201`	`+"database is not read only",`
	`202`	`+)));`
`193`	`203`	`}else{`
`194`	`204`	`break;`
`195`	`205`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,14 @@ fn settings() {`
`34`	`34`	`.keepalives_idle(Duration::from_secs(30))`
`35`	`35`	`.target_session_attrs(TargetSessionAttrs::ReadWrite),`
`36`	`36`	`);`
	`37`	`+check(`
	`38`	`+"connect_timeout=3 keepalives=0 keepalives_idle=30 target_session_attrs=read-only",`
	`39`	`+Config::new()`
	`40`	`+.connect_timeout(Duration::from_secs(3))`
	`41`	`+.keepalives(false)`
	`42`	`+.keepalives_idle(Duration::from_secs(30))`
	`43`	`+.target_session_attrs(TargetSessionAttrs::ReadOnly),`
	`44`	`+);`
`37`	`45`	`}`
`38`	`46`
`39`	`47`	`#[test]`

Comments

(0)