Fixed LineReader

dbms/programs/client/Client.cpp

@@ -496,7 +496,7 @@ private:
             if (!history_file.empty() && !Poco::File(history_file).exists())
                 Poco::File(history_file).createFile();
 
-            LineReader lr(Suggest::instance(), history_file, '\\', config().has("multiline") ? ';' : 0);
+            LineReader lr(&Suggest::instance(), history_file, '\\', config().has("multiline") ? ';' : 0);
 
             do
             {

libs/libcommon/CMakeLists.txt

@@ -92,7 +92,7 @@ if(CCTZ_LIBRARY)
     target_link_libraries(common PRIVATE ${CCTZ_LIBRARY})
 endif()
 
-if (ENABLE_REPLXX)
+if (USE_REPLXX)
     target_link_libraries(common PRIVATE replxx)
 endif ()
 

libs/libcommon/include/common/LineReader.h

@@ -22,7 +22,7 @@ public:
         WordsRange getCompletions(const String & prefix, size_t prefix_length) const;
     };
 
-    LineReader(const Suggest & suggest, const String & history_file_path, char extender, char delimiter = 0);  /// if delimiter != 0, then it's multiline mode
+    LineReader(const Suggest * suggest, const String & history_file_path, char extender, char delimiter = 0);  /// if delimiter != 0, then it's multiline mode
     ~LineReader();
 
     /// Reads the whole line until delimiter (in multiline mode) or until the last line without extender.

libs/libcommon/src/LineReader.cpp

@@ -58,7 +58,7 @@ LineReader::Suggest::WordsRange LineReader::Suggest::getCompletions(const String
         });
 }
 
-LineReader::LineReader(const Suggest & suggest, const String & history_file_path_, char extender_, char delimiter_)
+LineReader::LineReader(const Suggest * suggest, const String & history_file_path_, char extender_, char delimiter_)
     : history_file_path(history_file_path_), extender(extender_), delimiter(delimiter_)
 {
 #if USE_REPLXX
@@ -68,9 +68,9 @@ LineReader::LineReader(const Suggest & suggest, const String & history_file_path
     if (!history_file_path.empty())
         rx.history_load(history_file_path);
 
-    auto callback = [&suggest] (const String & context, size_t context_size)
+    auto callback = [suggest] (const String & context, size_t context_size)
     {
-        auto range = suggest.getCompletions(context, context_size);
+        auto range = suggest->getCompletions(context, context_size);
         return replxx::Replxx::completions_t(range.first, range.second);
     };