adding math support to sql literal
Merge branch 'sql_literal_math' into 3-0-stable