Merge pull request #56813 from rafiss/backport20.2-56662

release-20.2: sql: handle bool values for compat-only session vars
cockroachdb · Nov 17, 2020 · 9a2605d · 9a2605d
2 parents ed6007b + de4e510
commit 9a2605d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/set b/pkg/sql/logictest/testdata/logic_test/set
@@ -424,3 +424,12 @@ SET TRANSACTION DEFERRABLE
 
 statement ok
 rollback
+
+statement ok
+SET standard_conforming_strings=true
+
+statement ok
+SET standard_conforming_strings='true'
+
+statement ok
+SET standard_conforming_strings='on'
diff --git a/pkg/sql/vars.go b/pkg/sql/vars.go
@@ -1234,6 +1234,7 @@ func makeCompatBoolVar(varName string, displayValue, anyValAllowed bool) session
 			return err
 		},
 		GlobalDefault: func(sv *settings.Values) string { return displayValStr },
+		GetStringVal:  makePostgresBoolGetStringValFn(varName),
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     			return err
     		},
     		GlobalDefault: func(sv *settings.Values) string { return displayValStr },
+    		GetStringVal:  makePostgresBoolGetStringValFn(varName),
     	}
     }
@@ Expand Down @@