Merge pull request #10691 from andrioni/andrioni/standard-conforming-…

…strings Support setting `standard_conforming_strings` to `on`
MaterializeInc · Feb 15, 2022 · 04b5f7e · 04b5f7e
2 parents b23318c + ace6ae2
commit 04b5f7e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/doc/user/content/release-notes.md b/doc/user/content/release-notes.md
@@ -122,6 +122,9 @@ changes that have not yet been documented.
 - Improve the clarity of any Avro schema resolution errors found when
   creating materialized sources and views. {{% gh 8415 %}}
 
+- Allow setting `standard_conforming_strings` to its default value of `on`.
+  Setting it to `off` is still not supported.
+
 {{< comment >}}
 Only add new release notes above this line.
 

diff --git a/src/coord/src/session/vars.rs b/src/coord/src/session/vars.rs
@@ -347,7 +347,15 @@ impl Vars {
         } else if name == SQL_SAFE_UPDATES.name {
             self.sql_safe_updates.set(value, local)
         } else if name == STANDARD_CONFORMING_STRINGS.name {
-            Err(CoordError::ReadOnlyParameter(&STANDARD_CONFORMING_STRINGS))
+            match bool::parse(value) {
+                Ok(value) if value == *STANDARD_CONFORMING_STRINGS.value => Ok(()),
+                Ok(_) => Err(CoordError::ConstrainedParameter(
+                    &STANDARD_CONFORMING_STRINGS,
+                )),
+                Err(()) => Err(CoordError::InvalidParameterType(
+                    &STANDARD_CONFORMING_STRINGS,
+                )),
+            }
         } else if name == TIMEZONE.name {
             if UncasedStr::new(value) != TIMEZONE.value {
                 return Err(CoordError::ConstrainedParameter(&TIMEZONE));

diff --git a/test/testdrive/session.td b/test/testdrive/session.td
@@ -41,6 +41,19 @@ contains:parameter "client_encoding" can only be set to "UTF8"
 ! SET NAMES = "something";
 contains:unrecognized configuration parameter "names"
 
+# standard_conforming_strings is constrained to true
+> SET standard_conforming_strings = ON;
+
+> SET standard_conforming_strings = true;
+
+> SET standard_conforming_strings TO TRUE;
+
+! SET standard_conforming_strings = OFF;
+contains:parameter "standard_conforming_strings" can only be set to "on"
+
+! SET standard_conforming_strings = typo;
+contains:parameter "standard_conforming_strings" requires a "boolean" value
+
 > SET sql_safe_updates = on
 > SHOW sql_safe_updates
 on