!152 解决gsql命令补齐问题&修复编译error

Merge pull request !152 from 罗梓浩/master
2020-08-29 09:28:58 +08:00 · 2020-08-29 09:28:58 +08:00 · 876784f519
parent 9d96bc87b0 aa50621d3c
commit 876784f519
2 changed files with 2240 additions and 406 deletions
--- a/src/bin/psql/input.h
+++ b/src/bin/psql/input.h
@ -16,8 +16,6 @@
 */
 #define USE_READLINE 1

-#include <editline/readline.h>
-
 #ifdef HAVE_LIBREADLINE
 #define USE_READLINE 1

@ -37,6 +35,8 @@
 #include <history.h>
 #endif
 #endif   /* HAVE_READLINE_READLINE_H, etc */
+#else
+#include <editline/readline.h>
 #endif   /* HAVE_LIBREADLINE */

 #include "libpq/pqexpbuffer.h"
--- a/src/bin/psql/tab-complete.cpp
+++ b/src/bin/psql/tab-complete.cpp