Replace xwb1989/sqlparser with forked temporalio/sqlparser

temporalio · Nov 15, 2023 · 5943678 · 5943678
1 parent 82f103d
commit 5943678
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 26 deletions.
diff --git a/common/archiver/filestore/query_parser.go b/common/archiver/filestore/query_parser.go
@@ -33,7 +33,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 	enumspb "go.temporal.io/api/enums/v1"
 
 	"go.temporal.io/server/common/convert"

diff --git a/common/archiver/gcloud/query_parser.go b/common/archiver/gcloud/query_parser.go
@@ -31,7 +31,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/convert"
 )

diff --git a/common/archiver/s3store/query_parser.go b/common/archiver/s3store/query_parser.go
@@ -32,7 +32,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/convert"
 	"go.temporal.io/server/common/primitives/timestamp"

diff --git a/common/persistence/visibility/store/elasticsearch/converter.go b/common/persistence/visibility/store/elasticsearch/converter.go
@@ -27,7 +27,7 @@
 package elasticsearch
 
 import (
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/persistence/visibility/store/query"
 )

diff --git a/common/persistence/visibility/store/query/converter.go b/common/persistence/visibility/store/query/converter.go
@@ -34,7 +34,7 @@ import (
 	"strings"
 
 	"github.com/olivere/elastic/v7"
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 )
 
 type (

diff --git a/common/persistence/visibility/store/query/interceptors_test.go b/common/persistence/visibility/store/query/interceptors_test.go
@@ -30,7 +30,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"github.com/stretchr/testify/assert"
 )

diff --git a/common/persistence/visibility/store/sql/query_converter.go b/common/persistence/visibility/store/sql/query_converter.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	enumspb "go.temporal.io/api/enums/v1"
 	"go.temporal.io/server/common/namespace"

diff --git a/common/persistence/visibility/store/sql/query_converter_mysql.go b/common/persistence/visibility/store/sql/query_converter_mysql.go
@@ -29,7 +29,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 	"go.temporal.io/server/common/namespace"
 	"go.temporal.io/server/common/persistence/sql/sqlplugin"
 	"go.temporal.io/server/common/persistence/visibility/store/query"

diff --git a/common/persistence/visibility/store/sql/query_converter_mysql_test.go b/common/persistence/visibility/store/sql/query_converter_mysql_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/persistence/visibility/store/query"
 )

diff --git a/common/persistence/visibility/store/sql/query_converter_postgresql.go b/common/persistence/visibility/store/sql/query_converter_postgresql.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 	"go.temporal.io/server/common/namespace"
 	"go.temporal.io/server/common/persistence/sql/sqlplugin"
 	"go.temporal.io/server/common/persistence/visibility/store/query"

diff --git a/common/persistence/visibility/store/sql/query_converter_postgresql_test.go b/common/persistence/visibility/store/sql/query_converter_postgresql_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/persistence/visibility/store/query"
 )

diff --git a/common/persistence/visibility/store/sql/query_converter_sqlite.go b/common/persistence/visibility/store/sql/query_converter_sqlite.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/namespace"
 	"go.temporal.io/server/common/persistence/sql/sqlplugin"

diff --git a/common/persistence/visibility/store/sql/query_converter_sqlite_test.go b/common/persistence/visibility/store/sql/query_converter_sqlite_test.go
@@ -29,7 +29,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	"go.temporal.io/server/common/persistence/visibility/store/query"
 )

diff --git a/common/persistence/visibility/store/sql/query_converter_test.go b/common/persistence/visibility/store/sql/query_converter_test.go
@@ -32,7 +32,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	enumspb "go.temporal.io/api/enums/v1"
 	"go.temporal.io/server/common/namespace"

diff --git a/common/persistence/visibility/store/sql/query_converter_util.go b/common/persistence/visibility/store/sql/query_converter_util.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 
 	enumspb "go.temporal.io/api/enums/v1"
 	"go.temporal.io/server/common/persistence/visibility/store/query"

diff --git a/common/persistence/visibility/store/standard/converter.go b/common/persistence/visibility/store/standard/converter.go
@@ -28,7 +28,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 	enumspb "go.temporal.io/api/enums/v1"
 
 	"go.temporal.io/server/common/namespace"

diff --git a/common/worker_versioning/worker_versioning.go b/common/worker_versioning/worker_versioning.go
@@ -29,7 +29,7 @@ import (
 	"fmt"
 
 	"github.com/gogo/protobuf/types"
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 	commonpb "go.temporal.io/api/common/v1"
 
 	persistencespb "go.temporal.io/server/api/persistence/v1"

diff --git a/develop/buildkite/third_party_deps.txt b/develop/buildkite/third_party_deps.txt
@@ -206,6 +206,11 @@ github.com/temporalio/ringpop-go/membership
 github.com/temporalio/ringpop-go/shared
 github.com/temporalio/ringpop-go/swim
 github.com/temporalio/ringpop-go/util
+github.com/temporalio/sqlparser
+github.com/temporalio/sqlparser/dependency/bytes2
+github.com/temporalio/sqlparser/dependency/hack
+github.com/temporalio/sqlparser/dependency/querypb
+github.com/temporalio/sqlparser/dependency/sqltypes
 github.com/temporalio/tchannel-go
 github.com/temporalio/tchannel-go/internal/argreader
 github.com/temporalio/tchannel-go/json
@@ -230,11 +235,6 @@ github.com/uber-go/tally/v4/m3/thriftudp
 github.com/uber-go/tally/v4/prometheus
 github.com/uber-go/tally/v4/statsd
 github.com/uber-go/tally/v4/thirdparty/github.com/apache/thrift/lib/go/thrift
-github.com/xwb1989/sqlparser
-github.com/xwb1989/sqlparser/dependency/bytes2
-github.com/xwb1989/sqlparser/dependency/hack
-github.com/xwb1989/sqlparser/dependency/querypb
-github.com/xwb1989/sqlparser/dependency/sqltypes
 go.opencensus.io/internal
 go.opencensus.io/internal/tagencoding
 go.opencensus.io/metric/metricdata

diff --git a/go.mod b/go.mod
@@ -29,12 +29,12 @@ require (
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/stretchr/testify v1.8.4
 	github.com/temporalio/ringpop-go v0.0.0-20230606200434-b5c079f412d3
+	github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb
 	github.com/temporalio/tchannel-go v1.22.1-0.20220818200552-1be8d8cffa5b
 	github.com/temporalio/tctl-kit v0.0.0-20230328153839-577f95d16fa0
 	github.com/uber-go/tally/v4 v4.1.7
 	github.com/urfave/cli v1.22.14
 	github.com/urfave/cli/v2 v2.4.0
-	github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0
 	go.opentelemetry.io/otel v1.19.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0

diff --git a/go.sum b/go.sum
@@ -340,6 +340,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/temporalio/ringpop-go v0.0.0-20230606200434-b5c079f412d3 h1:V1U9fvhusDJ1pyAvQWg0+u6mQ+o5WtRfMbnnTIZe0Fo=
 github.com/temporalio/ringpop-go v0.0.0-20230606200434-b5c079f412d3/go.mod h1:LA2yFb94r5XoEnuMVHkCC/P5174whMy2Dd+cu+AEcQA=
+github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb h1:YzHH/U/dN7vMP+glybzcXRTczTrgfdRisNTzAj7La04=
+github.com/temporalio/sqlparser v0.0.0-20231115171017-f4060bcfa6cb/go.mod h1:143qKdh3G45IgV9p+gbAwp3ikRDI8mxsijFiXDfuxsw=
 github.com/temporalio/tchannel-go v1.22.1-0.20220818200552-1be8d8cffa5b h1:Fs3LdlF7xbnOWHymbFmvIEuxIEt1dNRCfaDkoajSaZk=
 github.com/temporalio/tchannel-go v1.22.1-0.20220818200552-1be8d8cffa5b/go.mod h1:c+V9Z/ZgkzAdyGvHrvC5AsXgN+M9Qwey04cBdKYzV7U=
 github.com/temporalio/tctl-kit v0.0.0-20230328153839-577f95d16fa0 h1:E1iAre7/4VvSJri8uOnItKVsMKnP+WEQourm+zVO0cc=
@@ -362,8 +364,6 @@ github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk=
 github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA=
 github.com/urfave/cli/v2 v2.4.0 h1:m2pxjjDFgDxSPtO8WSdbndj17Wu2y8vOT86wE/tjr+I=
 github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg=
-github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=
-github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

diff --git a/service/frontend/task_reachability.go b/service/frontend/task_reachability.go
@@ -32,7 +32,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/xwb1989/sqlparser"
+	"github.com/temporalio/sqlparser"
 	enumspb "go.temporal.io/api/enums/v1"
 	"go.temporal.io/api/serviceerror"
 	taskqueuepb "go.temporal.io/api/taskqueue/v1"
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/xwb1989/sqlparser"
+    	"github.com/temporalio/sqlparser"
     	"go.temporal.io/server/common/convert"
     )
@@ Expand Down @@