diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2015-05-10 12:56:19 -0400 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2015-05-10 12:56:19 -0400 |
| commit | e07da25c269c5ea86613bf0ffddc416fbdbc7b11 (patch) | |
| tree | 2bfb9ebc9bf9cc98ae2bf7ed344a44e1ba39058d | |
| parent | 3380a1634d20006b5e717ad122eb51f9cb9e0afe (diff) | |
Fix .sql generation to honor 'noMangleSql' in column names
| -rw-r--r-- | src/cjr_print.sml | 3 | ||||
| -rw-r--r-- | tests/nomangle.ur | 7 | ||||
| -rw-r--r-- | tests/nomangle.urp | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/cjr_print.sml b/src/cjr_print.sml index b3b12fe8..9c456863 100644 --- a/src/cjr_print.sml +++ b/src/cjr_print.sml @@ -3665,8 +3665,7 @@ fun p_sql env (ds, _) = let val t = sql_type_in env t in - box [string "uw_", - string (CharVector.map Char.toLower x), + box [string (Settings.mangleSql (CharVector.map Char.toLower x)), space, string (#p_sql_type (Settings.currentDbms ()) t), case t of diff --git a/tests/nomangle.ur b/tests/nomangle.ur new file mode 100644 index 00000000..b853a690 --- /dev/null +++ b/tests/nomangle.ur @@ -0,0 +1,7 @@ +table foo : { Bar : int, Baz : string } + PRIMARY KEY Baz + +fun main () : transaction page = + rs <- queryX1 (SELECT foo.Bar FROM foo WHERE foo.Baz = 'Hi') + (fn r => <xml>{[r.Bar]}</xml>); + return <xml><body>{rs}</body></xml> diff --git a/tests/nomangle.urp b/tests/nomangle.urp new file mode 100644 index 00000000..7fab4b03 --- /dev/null +++ b/tests/nomangle.urp @@ -0,0 +1,5 @@ +database dbname=test +noMangleSql +sql nomangle.sql + +nomangle |