hsdev 0.3.0.2 → 0.3.0.3

raw patch · 3 files changed

+5/−5 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hsdev.cabal +1/−1
• src/HsDev/Database/SQLite.hs +2/−2
• src/HsDev/Tools/HDocs.hs +2/−2

@@ -1,5 +1,5 @@ name:                hsdev
-version:             0.3.0.2
+version:             0.3.0.3
 synopsis:            Haskell development library
 description:
   Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references, hayoo search etc.

@@ -88,7 +88,7 @@ 			| not hasTables = initDb conn
 			| otherwise = return conn
 		initDb conn' = SQL.withTransaction conn' $ do
-			mapM_ (SQL.execute_ conn) commands
+			mapM_ (SQL.execute_ conn') commands
 			SQL.execute @(Text, Value) conn' "insert into hsdev values (?, ?);" ("version", toJSON version)
 			return conn'
 	start
@@ -351,7 +351,7 @@ 			where
 				insertNames = executeMany insertQuery namesData
 				replaceQNames = executeMany insertQuery qnamesData
-				setResolvedSymbolIds = execute "update names set symbol_id = (select symbol_id from scopes as sc where names.module_id == sc.module_id and ((names.qualifier is null and sc.qualifier is null) or (names.qualifier == sc.qualifier)) and names.name == sc.name) where module_id == ? and resolved_module is not null and resolved_name is not null;" (Only mid)
+				setResolvedSymbolIds = execute "update names set symbol_id = (select sc.symbol_id from scopes as sc, symbols as s, modules as m where names.module_id == sc.module_id and ((names.qualifier is null and sc.qualifier is null) or (names.qualifier == sc.qualifier)) and names.name == sc.name and s.id == sc.symbol_id and m.id == s.module_id and s.name == names.resolved_name and m.name == names.resolved_module) where module_id == ? and resolved_module is not null and resolved_name is not null;" (Only mid)
 				insertQuery = "insert or replace into names (module_id, qualifier, name, line, column, line_to, column_to, def_line, def_column, resolved_module, resolved_name, resolve_error) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"
 				namesData = map toData $ p ^.. P.names
 				qnamesData = map toQData $ p ^.. P.qnames

@@ -59,7 +59,7 @@ 		liftGhc $ hsdevLiftWith (ToolError "hdocs") $
 			liftM (map snd) $ HDocs.readSourcesGhc opts $ map (view (moduleFile . path)) ms
 #else
-hdocsy _ _ = notSupported >> return mempty
+hdocsy _ _ _ = notSupported >> return mempty
 #endif
 
 -- | Get docs for module
@@ -76,7 +76,7 @@ 				liftIO $ hsdevLiftWith (ToolError "hdocs") $ HDocs.moduleDocsF df (T.unpack mname)
 			_ -> hsdevError $ ToolError "hdocs" $ "Can't get docs for: " ++ show mloc'
 #else
-hdocs _ _ = notSupported >> return mempty
+hdocs _ _ _ = notSupported >> return mempty
 #endif
 
 -- | Get docs for package