Allow maintaining the parser independently

Author: k0kubun

cmd/clickhousedef/clickhousedef.go

@@ -7,10 +7,10 @@ import (
 
 	"github.com/howeyc/gopass"
 	"github.com/jessevdk/go-flags"
-	"github.com/k0kubun/sqldef"
 	"github.com/k0kubun/sqldef/adapter"
-	"github.com/k0kubun/sqldef/schema"
+	"github.com/sqldef/clickhousedef"
 	"github.com/sqldef/clickhousedef/adapter/clickhouse"
+	"github.com/sqldef/clickhousedef/schema"
 )
 
 // Return parsed options and schema filename

schema/parser.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/k0kubun/sqldef/sqlparser"
+	"github.com/sqldef/clickhousedef/sqlparser"
 )
 
 // Convert back `type BoolVal bool`

sqldef.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/k0kubun/sqldef/adapter"
-	"github.com/k0kubun/sqldef/schema"
+	"github.com/sqldef/clickhousedef/schema"
 )
 
 type Options struct {

sqlparser/analyzer.go

@@ -25,7 +25,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 // These constants are used to identify the SQL statement type.

sqlparser/analyzer_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 func TestPreview(t *testing.T) {

sqlparser/ast.go

@@ -24,8 +24,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 // Instructions for creating new types: If a type
@@ -44,7 +44,7 @@ import (
 // is the AST representation of the query. If a DDL statement
 // is partially parsed but still contains a syntax error, the
 // error is ignored and the DDL is returned anyway.
-func Parse(sql string) (Statement, error) { // NOTE: not used in sqldef anymore
+func Parse(sql string) (Statement, error) { // NOTE: not used in clickhousedef anymore
 	tokenizer := NewStringTokenizer(sql, ParserModeMysql)
 	if yyParse(tokenizer) != 0 {
 		if tokenizer.partialDDL != nil {

sqlparser/ast_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 func TestAppend(t *testing.T) {

sqlparser/dependency/sqltypes/bind_variables.go

@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 // NullBindVariable is a bindvar with NULL value.

sqlparser/dependency/sqltypes/bind_variables_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 func TestProtoConversions(t *testing.T) {

sqlparser/dependency/sqltypes/plan_value.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 // PlanValue represents a value or a list of values for

sqlparser/dependency/sqltypes/plan_value_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 func TestPlanValueIsNull(t *testing.T) {

sqlparser/dependency/sqltypes/testing.go

@@ -17,7 +17,7 @@ limitations under the License.
 package sqltypes
 
 import (
-	querypb "github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	querypb "github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 // Functions in this file should only be used for testing.

sqlparser/dependency/sqltypes/type.go

@@ -19,7 +19,7 @@ package sqltypes
 import (
 	"fmt"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 // This file provides wrappers and support

sqlparser/dependency/sqltypes/type_test.go

@@ -19,7 +19,7 @@ package sqltypes
 import (
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 func TestTypeValues(t *testing.T) {

sqlparser/dependency/sqltypes/value.go

@@ -23,10 +23,10 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/bytes2"
-	"github.com/k0kubun/sqldef/sqlparser/dependency/hack"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/bytes2"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/hack"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 var (

sqlparser/dependency/sqltypes/value_test.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 const (

sqlparser/encodable.go

@@ -19,7 +19,7 @@ package sqlparser
 import (
 	"bytes"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 // This file contains types that are 'Encodable'.

sqlparser/encodable_test.go

@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 func TestEncodable(t *testing.T) {

sqlparser/github_test.go

@@ -45,7 +45,7 @@ func TestParsing(t *testing.T) {
 		}
 
 		if _, err := Parse(test.sql); err != nil {
-			t.Errorf("https://github.com/k0kubun/sqldef/sqlparser/issues/%d:\nParse(%q) err = %s, want nil", test.id, test.sql, err)
+			t.Errorf("https://github.com/sqldef/clickhousedef/sqlparser/issues/%d:\nParse(%q) err = %s, want nil", test.id, test.sql, err)
 		}
 	}
 }

sqlparser/normalizer.go

@@ -19,9 +19,9 @@ package sqlparser
 import (
 	"fmt"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 // Normalize changes the statement to use bind values, and

sqlparser/normalizer_test.go

@@ -21,8 +21,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 func TestNormalize(t *testing.T) {

sqlparser/parsed_query.go

@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 // ParsedQuery represents a parsed query where

sqlparser/parsed_query_test.go

@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 )
 
 func TestNewParsedQuery(t *testing.T) {

sqlparser/redact_query.go

@@ -1,6 +1,6 @@
 package sqlparser
 
-import querypb "github.com/k0kubun/sqldef/sqlparser/dependency/querypb"
+import querypb "github.com/sqldef/clickhousedef/sqlparser/dependency/querypb"
 
 // RedactSQLQuery returns a sql string with the params stripped out for display
 func RedactSQLQuery(sql string) (string, error) {

sqlparser/token.go

@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/k0kubun/sqldef/sqlparser/dependency/bytes2"
-	"github.com/k0kubun/sqldef/sqlparser/dependency/sqltypes"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/bytes2"
+	"github.com/sqldef/clickhousedef/sqlparser/dependency/sqltypes"
 )
 
 type ParserMode int