From d4ab62307f5c0521fcf1762f94faa6670558a6ea Mon Sep 17 00:00:00 2001 From: Radon Rosborough Date: Sun, 7 Feb 2021 09:07:41 -0800 Subject: [PATCH] Re-enable sqls for all databases This reverts commit 97b1f051189ccda956af283dd233bcf0795a7511 now that https://github.com/lighttiger2505/sqls/issues/39 is solved. --- langs/mariadb.yaml | 9 +++++++++ langs/mysql.yaml | 9 +++++++++ langs/postgresql.yaml | 9 +++++++++ shared/sqls.yaml | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/langs/mariadb.yaml b/langs/mariadb.yaml index f86b33d..f70d310 100644 --- a/langs/mariadb.yaml +++ b/langs/mariadb.yaml @@ -8,6 +8,8 @@ install: - libaio1 - libtinfo5 - mysql-client + riju: + - sqls manual: | install -d "${pkg}/opt/mariadb" @@ -41,3 +43,10 @@ run: | sleep 0.01 done (mysql --socket=socket < main.sql; mysql --socket=socket) + +lsp: + start: | + sqls + +skip: + - lsp diff --git a/langs/mysql.yaml b/langs/mysql.yaml index 7f64f57..4f39c1c 100644 --- a/langs/mysql.yaml +++ b/langs/mysql.yaml @@ -7,6 +7,8 @@ install: apt: - mysql-server - mysql-client + riju: + - sqls repl: | rm -rf data @@ -32,3 +34,10 @@ run: | sleep 0.01 done (mysql --socket="$PWD/socket" -u root < main.sql; mysql --socket="$PWD/socket" -u root) + +lsp: + start: | + sqls + +skip: + - lsp diff --git a/langs/postgresql.yaml b/langs/postgresql.yaml index 72660ee..d73ffa5 100644 --- a/langs/postgresql.yaml +++ b/langs/postgresql.yaml @@ -11,6 +11,8 @@ install: apt: - postgresql - postgresql-client + riju: + - sqls repl: | rm -rf data @@ -36,3 +38,10 @@ run: | set +e psql -h "$PWD/data" postgres -f main.sql psql -h "$PWD/data" postgres + +lsp: + start: | + sqls + +skip: + - lsp diff --git a/shared/sqls.yaml b/shared/sqls.yaml index 5afefab..0a70054 100644 --- a/shared/sqls.yaml +++ b/shared/sqls.yaml @@ -9,5 +9,5 @@ install: export GO111MODULE=on export GOPATH="$PWD/go" - go get github.com/lighttiger2505/sqls + go get github.com/lighttiger2505/sqls@master cp go/bin/sqls "${pkg}/usr/local/bin/"