diff options
author | Ziv Scully <ziv@mit.edu> | 2015-07-07 00:07:24 -0700 |
---|---|---|
committer | Ziv Scully <ziv@mit.edu> | 2015-07-07 00:07:24 -0700 |
commit | 03b7950e3639899de788cac8824a0e7f4be8a0bd (patch) | |
tree | 3863c03ffd1f8d9c22e67f009292ede55f64d4f7 /src | |
parent | f9021ccf1a76dd7e570061849acdec515b5be790 (diff) |
Add limited support for parsing SQL arithmetic.
Diffstat (limited to 'src')
-rw-r--r-- | src/sql.sml | 6 | ||||
-rw-r--r-- | src/sqlcache.sml | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/sql.sml b/src/sql.sml index 959575e9..27894e3f 100644 --- a/src/sql.sml +++ b/src/sql.sml @@ -325,6 +325,11 @@ val funcName = altL [constK "COUNT", constK "SUM", constK "AVG"] +fun arithmetic pExp = follow (const "(") + (follow pExp + (follow (altL (map const [" + ", " - ", " * ", " / "])) + (follow pExp (const ")")))) + val unmodeled = altL [const "COUNT(*)", const "CURRENT_TIMESTAMP"] @@ -340,6 +345,7 @@ fun sqexp chs = wrap uw_ident Computed, wrap known SqKnown, wrap func SqFunc, + wrap (arithmetic sqexp) (fn _ => Unmodeled), wrap unmodeled (fn () => Unmodeled), wrap (if !sqlcacheMode then sqlifySqlcache else sqlify) Inj, wrap (follow (const "COALESCE(") (follow sqexp (follow (const ",") diff --git a/src/sqlcache.sml b/src/sqlcache.sml index d5f6c1c0..5f737ac5 100644 --- a/src/sqlcache.sml +++ b/src/sqlcache.sml @@ -410,15 +410,13 @@ structure ConflictMaps = struct List.foldr (fn (SOME eqs, SOME acc) => SOME (IM.unionWith #1 (eqs, acc)) | _ => NONE) (SOME IM.empty) + val simplify = + map TS.listItems + o removeRedundant (fn (x, y) => TS.isSubset (y, x)) + o map (fn xs => TS.addList (TS.empty, xs)) + fun dnf (fQuery, fDml) = - let - val simplify = - map TS.listItems - o removeRedundant (fn (x, y) => TS.isSubset (y, x)) - o map (fn xs => TS.addList (TS.empty, xs)) - in - normalize simplify negateCmp Disj (Combo (Conj, [markQuery fQuery, markDml fDml])) - end + normalize simplify negateCmp Disj (Combo (Conj, [markQuery fQuery, markDml fDml])) val conflictMaps = List.mapPartial (mergeEqs o map eqsOfClass o equivClasses) o dnf |