Merge pull request #182 from dolthub/daylon/init-order

Added explicit initialization order to packages

server/cast/bool.go

@@ -19,8 +19,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initBool handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initBool() {
 	boolExplicit()
 	boolImplicit()
 }

server/cast/bytea.go

@@ -21,8 +21,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initBytea handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initBytea() {
 	// TODO: handle the different output formats?
 	byteaExplicit()
 	byteaImplicit()

server/cast/char.go

@@ -27,8 +27,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initChar handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initChar() {
 	charExplicit()
 	charImplicit()
 }

server/cast/float32.go

@@ -25,8 +25,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initFloat32 handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initFloat32() {
 	float32Explicit()
 	float32Implicit()
 }

server/cast/float64.go

@@ -25,8 +25,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initFloat64 handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initFloat64() {
 	float64Explicit()
 	float64Implicit()
 }

server/cast/init.go

@@ -0,0 +1,31 @@
+// Copyright 2024 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cast
+
+// Init initializes all casts in this package.
+func Init() {
+	initBool()
+	initBytea()
+	initChar()
+	initFloat32()
+	initFloat64()
+	initInt16()
+	initInt32()
+	initInt64()
+	initNumeric()
+	initText()
+	initUuid()
+	initVarChar()
+}

server/cast/int16.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initInt16 handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initInt16() {
 	int16Explicit()
 	int16Implicit()
 }

server/cast/int32.go

@@ -24,8 +24,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initInt32 handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initInt32() {
 	int32Explicit()
 	int32Implicit()
 }

server/cast/int64.go

@@ -24,8 +24,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initInt64 handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initInt64() {
 	int64Explicit()
 	int64Implicit()
 }

server/cast/numeric.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initNumeric handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initNumeric() {
 	numericExplicit()
 	numericImplicit()
 }

server/cast/text.go

@@ -27,8 +27,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initText handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initText() {
 	textExplicit()
 	textImplicit()
 }

server/cast/uuid.go

@@ -20,8 +20,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initUuid handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initUuid() {
 	uuidExplicit()
 	uuidImplicit()
 }

server/cast/varchar.go

@@ -27,8 +27,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
-func init() {
+// initVarChar handles all explicit and implicit casts that are built-in. This comprises only the "From" types.
+func initVarChar() {
 	varcharExplicit()
 	varcharImplicit()
 }

server/config/parameters.go

@@ -26,11 +26,11 @@ import (
 	"github.com/dolthub/go-mysql-server/sql/variables"
 )
 
-// init initializes or appends to SystemVariables as it functions as a global variable.
+// Init initializes or appends to SystemVariables as it functions as a global variable.
 // Currently, we append all of postgres configuration parameters to sql.SystemVariables.
 // This means that all of mysql system variables and postgres config parameters will be stored together.
 // TODO: get rid of me, use an integration point to define new sysvars
-func init() {
+func Init() {
 	// There are two postgres parameters have the same name as mysql variables
 	// TODO: issue with this approach is that those parameters will override the mysql variables.
 	if sql.SystemVariables == nil {

server/expression/binary_operator.go

@@ -21,7 +21,6 @@ import (
 	"github.com/dolthub/go-mysql-server/sql/expression"
 	vitess "github.com/dolthub/vitess/go/vt/sqlparser"
 
-	_ "github.com/dolthub/doltgresql/server/functions/binary"
 	"github.com/dolthub/doltgresql/server/functions/framework"
 )
 

server/expression/cast.go

@@ -21,7 +21,6 @@ import (
 	"github.com/dolthub/vitess/go/vt/proto/query"
 	vitess "github.com/dolthub/vitess/go/vt/sqlparser"
 
-	_ "github.com/dolthub/doltgresql/server/cast"
 	"github.com/dolthub/doltgresql/server/functions/framework"
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )

server/expression/unary_operator.go

@@ -21,7 +21,6 @@ import (
 	vitess "github.com/dolthub/vitess/go/vt/sqlparser"
 
 	"github.com/dolthub/doltgresql/server/functions/framework"
-	_ "github.com/dolthub/doltgresql/server/functions/unary"
 )
 
 // UnaryOperator represents a VALUE OPERATOR VALUE expression.

server/functions/abs.go

@@ -22,8 +22,8 @@ import (
 	"github.com/dolthub/doltgresql/utils"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAbs registers the functions to the catalog.
+func initAbs() {
 	framework.RegisterFunction(abs_int16)
 	framework.RegisterFunction(abs_int32)
 	framework.RegisterFunction(abs_int64)

server/functions/acos.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAcos registers the functions to the catalog.
+func initAcos() {
 	framework.RegisterFunction(acos_float64)
 }
 

server/functions/acosd.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAcosd registers the functions to the catalog.
+func initAcosd() {
 	framework.RegisterFunction(acosd_float64)
 }
 

server/functions/acosh.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAcosh registers the functions to the catalog.
+func initAcosh() {
 	framework.RegisterFunction(acosh_float64)
 }
 

server/functions/ascii.go

@@ -19,8 +19,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAscii registers the functions to the catalog.
+func initAscii() {
 	framework.RegisterFunction(ascii_varchar)
 }
 

server/functions/asin.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAsin registers the functions to the catalog.
+func initAsin() {
 	framework.RegisterFunction(asin_float64)
 }
 

server/functions/asind.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAsind registers the functions to the catalog.
+func initAsind() {
 	framework.RegisterFunction(asind_float64)
 }
 

server/functions/asinh.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAsinh registers the functions to the catalog.
+func initAsinh() {
 	framework.RegisterFunction(asinh_float64)
 }
 

server/functions/atan.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAtan registers the functions to the catalog.
+func initAtan() {
 	framework.RegisterFunction(atan_float64)
 }
 

server/functions/atan2.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAtan2 registers the functions to the catalog.
+func initAtan2() {
 	framework.RegisterFunction(atan2_float64)
 }
 

server/functions/atan2d.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAtan2d registers the functions to the catalog.
+func initAtan2d() {
 	framework.RegisterFunction(atan2d_float64)
 }
 

server/functions/atand.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAtand registers the functions to the catalog.
+func initAtand() {
 	framework.RegisterFunction(atand_float64)
 }
 

server/functions/atanh.go

@@ -23,8 +23,8 @@ import (
 	pgtypes "github.com/dolthub/doltgresql/server/types"
 )
 
-// init registers the functions to the catalog.
-func init() {
+// initAtanh registers the functions to the catalog.
+func initAtanh() {
 	framework.RegisterFunction(atanh_float64)
 }
 

server/functions/binary/bit_and.go

@@ -22,8 +22,8 @@ import (
 // These functions can be gathered using the following query from a Postgres 15 instance:
 // SELECT * FROM pg_operator o WHERE o.oprname = '&' ORDER BY o.oprcode::varchar;
 
-// init registers the functions to the catalog.
-func init() {
+// InitBinaryBitAnd registers the functions to the catalog.
+func InitBinaryBitAnd() {
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitAnd, int2and)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitAnd, int4and)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitAnd, int8and)

server/functions/binary/bit_or.go

@@ -22,8 +22,8 @@ import (
 // These functions can be gathered using the following query from a Postgres 15 instance:
 // SELECT * FROM pg_operator o WHERE o.oprname = '|' ORDER BY o.oprcode::varchar;
 
-// init registers the functions to the catalog.
-func init() {
+// initBinaryBitOr registers the functions to the catalog.
+func initBinaryBitOr() {
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitOr, int2or)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitOr, int4or)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitOr, int8or)

server/functions/binary/bit_xor.go

@@ -22,8 +22,8 @@ import (
 // These functions can be gathered using the following query from a Postgres 15 instance:
 // SELECT * FROM pg_operator o WHERE o.oprname = '#' ORDER BY o.oprcode::varchar;
 
-// init registers the functions to the catalog.
-func init() {
+// initBinaryBitXor registers the functions to the catalog.
+func initBinaryBitXor() {
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitXor, int2xor)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitXor, int4xor)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryBitXor, int8xor)

server/functions/binary/divide.go

@@ -26,8 +26,8 @@ import (
 // These functions can be gathered using the following query from a Postgres 15 instance:
 // SELECT * FROM pg_operator o WHERE o.oprname = '/' ORDER BY o.oprcode::varchar;
 
-// init registers the functions to the catalog.
-func init() {
+// initBinaryDivide registers the functions to the catalog.
+func initBinaryDivide() {
 	framework.RegisterBinaryFunction(framework.Operator_BinaryDivide, float4div)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryDivide, float48div)
 	framework.RegisterBinaryFunction(framework.Operator_BinaryDivide, float8div)