issue #20044: Fix bug in sql where statement not escaping properly. Remove memoize on schema call.
Merge branch '20044B' into 20044
Merge remote-tracking branch 'JOHN/20044' into 20044