修复错误，优化性能，实现类型系统，优化安装卸载过程

chusql-cli/app/Main.hs

@@ -3,8 +3,9 @@
 module Main (main) where
 
 import ChuSQL.CLI.Format (OutputFormat (..), formatName, parseFormat)
+import ChuSQL.CLI.Password (readPasswordInput)
 import ChuSQL.CLI.Script (stripTerminator)
-import ChuSQL.CLI.Session (
+import ChuSQL.Interface.Session (
     Session,
     authenticateSession,
     isPlainIdentifier,
@@ -13,7 +14,6 @@ import ChuSQL.CLI.Session (
  )
 import ChuSQL.Interface.Config (ServerConfig (..), loadServerConfigAt, loadWebConfigAt, rootUserName)
 import ChuSQL.Interface.Link (Client, closeClient, connectClient)
-import ChuSQL.Interface.Settings (readSettingsFile)
 import ChuSQL.Interface.TOML (resolveConfigPath)
 import Control.Exception (finally)
 import Control.Monad (unless)
@@ -27,7 +27,7 @@ import System.Console.Haskeline (defaultSettings, getPassword, runInputT)
 import System.Directory (getHomeDirectory)
 import System.Exit (exitFailure)
 import System.FilePath ((</>))
-import System.IO (hSetEncoding, stderr, stdout, utf8)
+import System.IO (hFlush, hIsTerminalDevice, hPutStr, hSetEncoding, stderr, stdin, stdout, utf8)
 
 -- chusql-cli：与 Web 管理端并列的前端，接到拥有存储的 server 上跑 SQL，账号与 Web 共用。
 
@@ -44,7 +44,7 @@ data Options = Options
 optionsParser :: Parser Options
 optionsParser =
     Options
-        <$> optional (T.pack <$> strOption (long "user" <> short 'u' <> metavar "USER" <> help "Sign in as this account (default: the configured administrator)"))
+        <$> optional (T.pack <$> strOption (long "user" <> short 'u' <> metavar "USER" <> help "Sign in as this account (default: root)"))
         <*> ( T.pack
                 <$> strOption
                     ( long "database"
@@ -65,7 +65,7 @@ optionsParser =
             )
         <*> optional (T.pack <$> strOption (long "execute" <> short 'e' <> metavar "SQL" <> help "Run one statement and exit"))
         <*> optional (strOption (long "history" <> metavar "FILE" <> help "SQL history file (default ~/.chusql_history)"))
-        <*> optional (strOption (long "config" <> metavar "FILE" <> help "Config file to read (default: the fixed chusql.toml under the system config directory)"))
+        <*> optional (strOption (long "config" <> metavar "FILE" <> help "Config file to read (default: the fixed settings.toml under the system config directory)"))
 
 -- | 把 --format 的取值解析成格式
 formatReader :: String -> Either String OutputFormat
@@ -89,9 +89,8 @@ main = do
     options <- execParser parserInfo
     configPath <- resolveConfigPath (optConfig options)
     base <- loadWebConfigAt configPath
-    saved <- readSettingsFile configPath
     config <- loadServerConfigAt configPath
-    let rootName = rootUserName base saved
+    let rootName = rootUserName base
         userName = fromMaybe rootName (optUser options)
     password <- promptPassword userName
     connected <- connectClient (T.pack (scHost config)) (scPort config)
@@ -139,8 +138,15 @@ selectDatabase session wanted
 -- | 交互式读取口令；直接回车表示空口令
 promptPassword :: Text -> IO Text
 promptPassword user = do
-    entered <- runInputT defaultSettings (getPassword (Just '*') (T.unpack user <> "'s password: "))
-    pure (maybe "" T.pack entered)
+    terminal <- hIsTerminalDevice stdin
+    if terminal
+        then do
+            entered <- runInputT defaultSettings (getPassword (Just '*') (T.unpack user <> "'s password: "))
+            pure (maybe "" T.pack entered)
+        else do
+            hPutStr stderr (T.unpack user <> "'s password: ")
+            hFlush stderr
+            readPasswordInput stdin
 
 -- | 取历史文件路径，没给就用默认
 resolveHistory :: Maybe FilePath -> IO (Maybe FilePath)

chusql-cli/app/Repl.hs

@@ -7,8 +7,9 @@ module Repl
     ) where
 
 import ChuSQL.CLI.Format (OutputFormat, formatName, renderResult, renderRows)
+import ChuSQL.CLI.History (historySettings, rememberStatement)
 import ChuSQL.CLI.Script (Meta (..), errorHint, metaHelp, parseMeta, takeStatement)
-import ChuSQL.CLI.Session (Session, catalog, databases, roleViews, runStatement, sessionDatabase, switchDatabase)
+import ChuSQL.Interface.Session (Session, catalog, databases, roleViews, runStatement, sessionDatabase, switchDatabase)
 import ChuSQL.Core.Protocol (SchemaColumn (..), TableInfo (..))
 import ChuSQL.Interface.Protocol (Grant (..), RoleView (..))
 import Control.Monad (forM_, when)
@@ -25,7 +26,7 @@ import System.IO (hIsTerminalDevice, stderr, stdin)
 -- | 交互循环，没有历史文件就不落盘
 runRepl :: Session -> IORef OutputFormat -> Maybe FilePath -> IO ()
 runRepl session formatRef historyPath =
-    runInputT (defaultSettings{historyFile = historyPath}) (loop session formatRef T.empty)
+    runInputT (historySettings historyPath) (loop session formatRef T.empty)
 
 -- | 入口处直接报错（-e 与启动阶段用）
 reportError :: Text -> IO ()
@@ -56,6 +57,7 @@ loop session formatRef buffer = do
                 then loop session formatRef buffer
                 else case (T.null buffer, parseMeta line) of
                     (True, Just meta) -> do
+                        rememberStatement line
                         again <- runMeta session formatRef meta
                         when again (loop session formatRef T.empty)
                     _ -> do
@@ -81,7 +83,9 @@ drain :: Session -> IORef OutputFormat -> Text -> InputT IO Text
 drain session formatRef buffer = case takeStatement buffer of
     Nothing -> pure (T.strip buffer)
     Just (statement, rest) -> do
-        when (not (T.null statement)) (runOne session formatRef statement)
+        when (not (T.null statement)) $ do
+            rememberStatement (statement <> ";")
+            runOne session formatRef statement
         drain session formatRef rest
 
 -- | 执行一条语句并打印结果