Revert internal package change

rethinkdb · Apr 13, 2016 · ad28ba0 · ad28ba0
1 parent c69d7ba
commit ad28ba0
Show file tree

Hide file tree

Showing 39 changed files with 25 additions and 25 deletions.
diff --git a/connection.go b/connection.go
@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 const (

diff --git a/connection_handshake.go b/connection_handshake.go
@@ -16,7 +16,7 @@ import (
 
 	"golang.org/x/crypto/pbkdf2"
 
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 type HandshakeVersion int

diff --git a/cursor.go b/cursor.go
@@ -7,8 +7,8 @@ import (
 	"reflect"
 	"sync"
 
-	"gopkg.in/dancannon/gorethink.v2/internal/encoding"
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	"gopkg.in/dancannon/gorethink.v2/encoding"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 var (

diff --git a/internal/encoding/cache.go → encoding/cache.go b/internal/encoding/cache.go → encoding/cache.go
diff --git a/internal/encoding/decoder.go → encoding/decoder.go b/internal/encoding/decoder.go → encoding/decoder.go
diff --git a/internal/encoding/decoder_test.go → encoding/decoder_test.go b/internal/encoding/decoder_test.go → encoding/decoder_test.go
diff --git a/internal/encoding/decoder_types.go → encoding/decoder_types.go b/internal/encoding/decoder_types.go → encoding/decoder_types.go
diff --git a/internal/encoding/encoder.go → encoding/encoder.go b/internal/encoding/encoder.go → encoding/encoder.go
diff --git a/internal/encoding/encoder_test.go → encoding/encoder_test.go b/internal/encoding/encoder_test.go → encoding/encoder_test.go
diff --git a/internal/encoding/encoder_types.go → encoding/encoder_types.go b/internal/encoding/encoder_types.go → encoding/encoder_types.go
diff --git a/internal/encoding/encoding.go → encoding/encoding.go b/internal/encoding/encoding.go → encoding/encoding.go
diff --git a/internal/encoding/encoding_test.go → encoding/encoding_test.go b/internal/encoding/encoding_test.go → encoding/encoding_test.go
diff --git a/internal/encoding/errors.go → encoding/errors.go b/internal/encoding/errors.go → encoding/errors.go
diff --git a/internal/encoding/fold.go → encoding/fold.go b/internal/encoding/fold.go → encoding/fold.go
diff --git a/internal/encoding/tags.go → encoding/tags.go b/internal/encoding/tags.go → encoding/tags.go
diff --git a/internal/encoding/utils.go → encoding/utils.go b/internal/encoding/utils.go → encoding/utils.go
diff --git a/errors.go b/errors.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 var (

diff --git a/gorethink.go b/gorethink.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 
-	"gopkg.in/dancannon/gorethink.v2/internal/encoding"
+	"gopkg.in/dancannon/gorethink.v2/encoding"
 )
 
 var (

diff --git a/node.go b/node.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	"github.com/hailocab/go-hostpool"
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Node represents a database server in the cluster

diff --git a/internal/ql2/generate.go → ql2/generate.go b/internal/ql2/generate.go → ql2/generate.go
diff --git a/internal/ql2/ql2.pb.go → ql2/ql2.pb.go b/internal/ql2/ql2.pb.go → ql2/ql2.pb.go
diff --git a/internal/ql2/ql2.proto → ql2/ql2.proto b/internal/ql2/ql2.proto → ql2/ql2.proto
diff --git a/query.go b/query.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // A Query represents a query ready to be sent to the database, A Query differs

diff --git a/query_admin.go b/query_admin.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Config can be used to read and/or update the configurations for individual

diff --git a/query_aggregation.go b/query_aggregation.go
@@ -1,6 +1,6 @@
 package gorethink
 
-import p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+import p "gopkg.in/dancannon/gorethink.v2/ql2"
 
 // Aggregation
 // These commands are used to compute smaller values from large sequences.

diff --git a/query_control.go b/query_control.go
@@ -6,7 +6,7 @@ import (
 
 	"reflect"
 
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Expr converts any value to an expression and is also used by many other terms

diff --git a/query_db.go b/query_db.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // DBCreate creates a database. A RethinkDB database is a collection of tables,

diff --git a/query_geospatial.go b/query_geospatial.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // CircleOpts contains the optional arguments for the Circle term.

diff --git a/query_join.go b/query_join.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // InnerJoin returns the inner product of two sequences (e.g. a table, a filter result)

diff --git a/query_manipulation.go b/query_manipulation.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Row returns the currently visited document. Note that Row does not work within

diff --git a/query_math.go b/query_math.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 var (

diff --git a/query_select.go b/query_select.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // DB references a database.

diff --git a/query_string.go b/query_string.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Match matches against a regular expression. If no match is found, returns

diff --git a/query_table.go b/query_table.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // TableCreateOpts contains the optional arguments for the TableCreate term

diff --git a/query_time.go b/query_time.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Now returns a time object representing the current time in UTC

diff --git a/query_transformation.go b/query_transformation.go
@@ -1,6 +1,6 @@
 package gorethink
 
-import p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+import p "gopkg.in/dancannon/gorethink.v2/ql2"
 
 // Map transform each element of the sequence by applying the given mapping
 // function. It takes two arguments, a sequence and a function of type

diff --git a/query_write.go b/query_write.go
@@ -1,7 +1,7 @@
 package gorethink
 
 import (
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // InsertOpts contains the optional arguments for the Insert term

diff --git a/session.go b/session.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // A Session represents a connection to a RethinkDB cluster and should be used

diff --git a/utils.go b/utils.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"gopkg.in/dancannon/gorethink.v2/internal/encoding"
-	p "gopkg.in/dancannon/gorethink.v2/internal/ql2"
+	"gopkg.in/dancannon/gorethink.v2/encoding"
+	p "gopkg.in/dancannon/gorethink.v2/ql2"
 )
 
 // Helper functions for constructing terms