DSH 0.5.5 → 0.6

raw patch · 3 files changed

+14/−11 lines, 3 filesdep ~FerryCoredep ~HaXmldep ~Pathfinder

Dependency ranges changed: FerryCore, HaXml, Pathfinder, haskell-src-exts

Files

• DSH.cabal +5/−5
• src/Database/DSH/Compile.hs +5/−5
• src/Database/DSH/QQ.hs +4/−1

@@ -1,5 +1,5 @@ Name:                DSH-Version:             0.5.5+Version:             0.6 Synopsis:            Database Supported Haskell Description:   This is a Haskell library for database-supported program execution. Using@@ -61,12 +61,12 @@                      HDBC               >= 2.2,                      convertible        >= 1.0,                      template-haskell   >= 2.4,-                     haskell-src-exts   >= 1.9,+                     haskell-src-exts   >= 1.11,                      syntax-trees       >= 0.1.2,-                     HaXml              >= 1.20,+                     HaXml              >= 1.22,                      csv                >= 0.1,-                     Pathfinder         >= 0.5.6,-                     FerryCore          >= 0.4.6.1+                     Pathfinder         >= 0.5.8,+                     FerryCore          >= 0.4.6.4    Hs-Source-Dirs:    src 

@@ -77,11 +77,11 @@ extractSQL (SQL q) = let (Document _ _ r _) = xmlParse "query" q                       in Bundle $ map extractQuery $ (deep $ tag "query_plan") (CElem r $impossible)     where-        extractQuery c@(CElem (X.Elem n attrs cs) _) = let qId = case fmap attrToInt $ lookup "id" attrs of+        extractQuery c@(CElem (X.Elem n attrs cs) _) = let qId = case fmap attrToInt $ lookup (X.N "id") attrs of                                                                     Just x -> x                                                                     Nothing -> $impossible-                                                           rId = fmap attrToInt $ lookup "idref" attrs-                                                           cId = fmap attrToInt $ lookup "colref" attrs+                                                           rId = fmap attrToInt $ lookup (X.N "idref") attrs+                                                           cId = fmap attrToInt $ lookup (X.N "colref") attrs                                                            ref = liftM2 (,) rId cId                                                            query = extractCData $  head $ concatMap children $ deep (tag "query") c                                                            schema = toSchemeInf $ map process $ concatMap (\x -> deep (tag "column") x) $ deep (tag "schema") c@@ -101,8 +101,8 @@                                   cols = map (\(n, v) -> (n, fromJust v)) $ filter (\(_, p) -> isJust p) results                                in SchemaInfo iterName cols         process :: Content i -> (String, Maybe Int)-        process (CElem (X.Elem _ attrs _) _) = let name = fromJust $ fmap attrToString $ lookup "name" attrs-                                                   pos = fmap attrToInt $ lookup "position" attrs+        process (CElem (X.Elem _ attrs _) _) = let name = fromJust $ fmap attrToString $ lookup (X.N "name") attrs+                                                   pos = fmap attrToInt $ lookup (X.N "position") attrs                                                 in (name, pos)         process _ = $impossible 

@@ -72,7 +72,10 @@ ferryParseMode :: ParseMode ferryParseMode = defaultParseMode {     extensions = [TransformListComp, ViewPatterns]-  , fixities = fixities defaultParseMode ++ infix_ 0 ["?"] ++ infixr_ 5 ["><", "<|", "|>"]+  , fixities = let v = case fixities defaultParseMode of+                            Nothing -> [] +                            Just x -> x+                in Just $ v ++ infix_ 0 ["?"] ++ infixr_ 5 ["><", "<|", "|>"]   }  exprParser :: String -> ParseResult Exp