From f54b60969484c4c9d50050ce1368de6aec0cc7ae Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Fri, 5 Apr 2019 16:52:28 +0200 Subject: [PATCH 1/2] Add build, tag for onigurama, remove for mysql_go_regex, update README Signed-off-by: Juanjo Alvarez --- README.md | 10 ---------- internal/regex/regex_go.go | 2 -- internal/regex/regex_oniguruma.go | 2 ++ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 827741210..84c8f904a 100644 --- a/README.md +++ b/README.md @@ -41,16 +41,6 @@ To install it, run: go get gopkg.in/src-d/go-mysql-server.v0 ``` -## Regular expression engine - -The **go-mysql-server** uses [oniguruma](github.com/kkos/oniguruma) as a default regular expression engine, so it's required to install the oniguruma first. -For Linux (if you have the `apt-get` tool) or OSX (if you have `homebrew` tool) the easiest way is by command: -```sh -make oniguruma # on linux you may need `sudo` -``` - -If you want to use regex engine from go's standard library, you have to compile **go-mysql-server** with `--tags mysql_go_regex` argument. - ## Documentation * [go-mysql-server godoc](https://godoc.org/github.com/src-d/go-mysql-server) diff --git a/internal/regex/regex_go.go b/internal/regex/regex_go.go index c7c44537a..a55fa42d5 100644 --- a/internal/regex/regex_go.go +++ b/internal/regex/regex_go.go @@ -1,5 +1,3 @@ -// +build mysql_go_regex - package regex import ( diff --git a/internal/regex/regex_oniguruma.go b/internal/regex/regex_oniguruma.go index 39444ac01..f2ed7911a 100644 --- a/internal/regex/regex_oniguruma.go +++ b/internal/regex/regex_oniguruma.go @@ -1,3 +1,5 @@ +// +build mysql_go_onigurama + package regex import ( From 2bb35ec02a1698808498753ebf022945f7ded1ae Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Fri, 5 Apr 2019 17:05:58 +0200 Subject: [PATCH 2/2] Change default returned by Engines Rename onigurama tag to just onigurama Signed-off-by: Juanjo Alvarez Fix typo Signed-off-by: Juanjo Alvarez --- internal/regex/regex_oniguruma.go | 2 +- internal/regex/regex_test.go | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/regex/regex_oniguruma.go b/internal/regex/regex_oniguruma.go index f2ed7911a..52f8948ac 100644 --- a/internal/regex/regex_oniguruma.go +++ b/internal/regex/regex_oniguruma.go @@ -1,4 +1,4 @@ -// +build mysql_go_onigurama +// +build oniguruma package regex diff --git a/internal/regex/regex_test.go b/internal/regex/regex_test.go index 1720ed740..118a19c85 100644 --- a/internal/regex/regex_test.go +++ b/internal/regex/regex_test.go @@ -10,12 +10,12 @@ func dummy(s string) (Matcher, Disposer, error) { return nil, nil, nil } func getDefault() string { for _, n := range Engines() { - if n == "go" { + if n == "oniguruma" { return n } } - return "oniguruma" + return "go" } func TestRegistration(t *testing.T) { @@ -33,9 +33,6 @@ func TestRegistration(t *testing.T) { engines = Engines() require.Len(engines, number) - err = Register("oniguruma", dummy) - require.Equal(true, ErrRegexAlreadyRegistered.Is(err)) - err = Register("nil", dummy) require.NoError(err) require.Len(Engines(), number+1)