diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mysql.sml | 2 | ||||
-rw-r--r-- | src/reduce.sml | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mysql.sml b/src/mysql.sml index e34efbd4..29a8c68f 100644 --- a/src/mysql.sml +++ b/src/mysql.sml @@ -80,7 +80,7 @@ fun checkRel (table, checkNullable) (s, xts) = String.substring (sl, 1, size sl - 2) else sl - val both = "LOWER(table_name) = ('" ^ sl ^ "')" + val both = "table_name = '" ^ sl ^ "'" val q = "SELECT COUNT(*) FROM information_schema." ^ table ^ " WHERE " ^ both diff --git a/src/reduce.sml b/src/reduce.sml index 933a4d94..8691b93a 100644 --- a/src/reduce.sml +++ b/src/reduce.sml @@ -849,7 +849,7 @@ fun reduce file = con = fn (_, n) => n, exp = fn (_, n) => n + 1} 0 - fun mayInline (polyC, n, t, e) = + fun mayInline (polyC, n, t, e, s) = let fun isPolicy t = case #1 t of @@ -857,6 +857,7 @@ fun reduce file = | TFun (_, t) => isPolicy t | _ => false in + not (Settings.checkNeverInline s) andalso case IM.find (uses, n) of NONE => false | SOME count => count <= 1 @@ -907,7 +908,7 @@ fun reduce file = ((DVal (x, n, t, e, s), loc), (polyC, namedC, - if mayInline (polyC, n, t, e) then + if mayInline (polyC, n, t, e, s) then IM.insert (namedE, n, e) else namedE)) |