Add support for PostgreSQL interval column
This commit is contained in:
go-jet
parent
641c62098c
commit
3013dc3647
30 changed files with 1038 additions and 255 deletions
|
|
@ -15,7 +15,6 @@ import (
|
|||
)
|
||||
|
||||
func TestGeneratedModel(t *testing.T) {
|
||||
|
||||
actor := model.Actor{}
|
||||
|
||||
assert.Equal(t, reflect.TypeOf(actor.ActorID).String(), "int32")
|
||||
|
|
@ -275,3 +274,345 @@ func newActorInfoTable() *ActorInfoTable {
|
|||
}
|
||||
}
|
||||
`
|
||||
|
||||
func TestGeneratedAllTypesSQLBuilderFiles(t *testing.T) {
|
||||
enumDir := testRoot + ".gentestdata/jetdb/test_sample/enum/"
|
||||
modelDir := testRoot + ".gentestdata/jetdb/test_sample/model/"
|
||||
tableDir := testRoot + ".gentestdata/jetdb/test_sample/table/"
|
||||
|
||||
enumFiles, err := ioutil.ReadDir(enumDir)
|
||||
assert.NilError(t, err)
|
||||
|
||||
testutils.AssertFileNamesEqual(t, enumFiles, "mood.go")
|
||||
testutils.AssertFileContent(t, enumDir+"mood.go", "\npackage enum", moodEnumContent)
|
||||
|
||||
modelFiles, err := ioutil.ReadDir(modelDir)
|
||||
assert.NilError(t, err)
|
||||
|
||||
testutils.AssertFileNamesEqual(t, modelFiles, "all_types.go", "all_types_view.go", "employee.go", "link.go",
|
||||
"mood.go", "person.go", "person_phone.go", "weird_names_table.go")
|
||||
|
||||
testutils.AssertFileContent(t, modelDir+"all_types.go", "\npackage model", allTypesModelContent)
|
||||
|
||||
tableFiles, err := ioutil.ReadDir(tableDir)
|
||||
assert.NilError(t, err)
|
||||
|
||||
testutils.AssertFileNamesEqual(t, tableFiles, "all_types.go", "employee.go", "link.go",
|
||||
"person.go", "person_phone.go", "weird_names_table.go")
|
||||
|
||||
testutils.AssertFileContent(t, tableDir+"all_types.go", "\npackage table", allTypesTableContent)
|
||||
}
|
||||
|
||||
var moodEnumContent = `
|
||||
package enum
|
||||
|
||||
import "github.com/go-jet/jet/postgres"
|
||||
|
||||
var Mood = &struct {
|
||||
Sad postgres.StringExpression
|
||||
Ok postgres.StringExpression
|
||||
Happy postgres.StringExpression
|
||||
}{
|
||||
Sad: postgres.NewEnumValue("sad"),
|
||||
Ok: postgres.NewEnumValue("ok"),
|
||||
Happy: postgres.NewEnumValue("happy"),
|
||||
}
|
||||
`
|
||||
|
||||
var allTypesModelContent = `
|
||||
package model
|
||||
|
||||
import (
|
||||
"github.com/google/uuid"
|
||||
"time"
|
||||
)
|
||||
|
||||
type AllTypes struct {
|
||||
SmallIntPtr *int16
|
||||
SmallInt int16
|
||||
IntegerPtr *int32
|
||||
Integer int32
|
||||
BigIntPtr *int64
|
||||
BigInt int64
|
||||
DecimalPtr *float64
|
||||
Decimal float64
|
||||
NumericPtr *float64
|
||||
Numeric float64
|
||||
RealPtr *float32
|
||||
Real float32
|
||||
DoublePrecisionPtr *float64
|
||||
DoublePrecision float64
|
||||
Smallserial int16
|
||||
Serial int32
|
||||
Bigserial int64
|
||||
VarCharPtr *string
|
||||
VarChar string
|
||||
CharPtr *string
|
||||
Char string
|
||||
TextPtr *string
|
||||
Text string
|
||||
ByteaPtr *[]byte
|
||||
Bytea []byte
|
||||
TimestampzPtr *time.Time
|
||||
Timestampz time.Time
|
||||
TimestampPtr *time.Time
|
||||
Timestamp time.Time
|
||||
DatePtr *time.Time
|
||||
Date time.Time
|
||||
TimezPtr *time.Time
|
||||
Timez time.Time
|
||||
TimePtr *time.Time
|
||||
Time time.Time
|
||||
IntervalPtr *string
|
||||
Interval string
|
||||
BooleanPtr *bool
|
||||
Boolean bool
|
||||
PointPtr *string
|
||||
BitPtr *string
|
||||
Bit string
|
||||
BitVaryingPtr *string
|
||||
BitVarying string
|
||||
TsvectorPtr *string
|
||||
Tsvector string
|
||||
UUIDPtr *uuid.UUID
|
||||
UUID uuid.UUID
|
||||
XMLPtr *string
|
||||
XML string
|
||||
JSONPtr *string
|
||||
JSON string
|
||||
JsonbPtr *string
|
||||
Jsonb string
|
||||
IntegerArrayPtr *string
|
||||
IntegerArray string
|
||||
TextArrayPtr *string
|
||||
TextArray string
|
||||
JsonbArray string
|
||||
TextMultiDimArrayPtr *string
|
||||
TextMultiDimArray string
|
||||
}
|
||||
`
|
||||
|
||||
var allTypesTableContent = `
|
||||
package table
|
||||
|
||||
import (
|
||||
"github.com/go-jet/jet/postgres"
|
||||
)
|
||||
|
||||
var AllTypes = newAllTypesTable()
|
||||
|
||||
type AllTypesTable struct {
|
||||
postgres.Table
|
||||
|
||||
//Columns
|
||||
SmallIntPtr postgres.ColumnInteger
|
||||
SmallInt postgres.ColumnInteger
|
||||
IntegerPtr postgres.ColumnInteger
|
||||
Integer postgres.ColumnInteger
|
||||
BigIntPtr postgres.ColumnInteger
|
||||
BigInt postgres.ColumnInteger
|
||||
DecimalPtr postgres.ColumnFloat
|
||||
Decimal postgres.ColumnFloat
|
||||
NumericPtr postgres.ColumnFloat
|
||||
Numeric postgres.ColumnFloat
|
||||
RealPtr postgres.ColumnFloat
|
||||
Real postgres.ColumnFloat
|
||||
DoublePrecisionPtr postgres.ColumnFloat
|
||||
DoublePrecision postgres.ColumnFloat
|
||||
Smallserial postgres.ColumnInteger
|
||||
Serial postgres.ColumnInteger
|
||||
Bigserial postgres.ColumnInteger
|
||||
VarCharPtr postgres.ColumnString
|
||||
VarChar postgres.ColumnString
|
||||
CharPtr postgres.ColumnString
|
||||
Char postgres.ColumnString
|
||||
TextPtr postgres.ColumnString
|
||||
Text postgres.ColumnString
|
||||
ByteaPtr postgres.ColumnString
|
||||
Bytea postgres.ColumnString
|
||||
TimestampzPtr postgres.ColumnTimestampz
|
||||
Timestampz postgres.ColumnTimestampz
|
||||
TimestampPtr postgres.ColumnTimestamp
|
||||
Timestamp postgres.ColumnTimestamp
|
||||
DatePtr postgres.ColumnDate
|
||||
Date postgres.ColumnDate
|
||||
TimezPtr postgres.ColumnTimez
|
||||
Timez postgres.ColumnTimez
|
||||
TimePtr postgres.ColumnTime
|
||||
Time postgres.ColumnTime
|
||||
IntervalPtr postgres.ColumnInterval
|
||||
Interval postgres.ColumnInterval
|
||||
BooleanPtr postgres.ColumnBool
|
||||
Boolean postgres.ColumnBool
|
||||
PointPtr postgres.ColumnString
|
||||
BitPtr postgres.ColumnString
|
||||
Bit postgres.ColumnString
|
||||
BitVaryingPtr postgres.ColumnString
|
||||
BitVarying postgres.ColumnString
|
||||
TsvectorPtr postgres.ColumnString
|
||||
Tsvector postgres.ColumnString
|
||||
UUIDPtr postgres.ColumnString
|
||||
UUID postgres.ColumnString
|
||||
XMLPtr postgres.ColumnString
|
||||
XML postgres.ColumnString
|
||||
JSONPtr postgres.ColumnString
|
||||
JSON postgres.ColumnString
|
||||
JsonbPtr postgres.ColumnString
|
||||
Jsonb postgres.ColumnString
|
||||
IntegerArrayPtr postgres.ColumnString
|
||||
IntegerArray postgres.ColumnString
|
||||
TextArrayPtr postgres.ColumnString
|
||||
TextArray postgres.ColumnString
|
||||
JsonbArray postgres.ColumnString
|
||||
TextMultiDimArrayPtr postgres.ColumnString
|
||||
TextMultiDimArray postgres.ColumnString
|
||||
|
||||
AllColumns postgres.ColumnList
|
||||
MutableColumns postgres.ColumnList
|
||||
}
|
||||
|
||||
// creates new AllTypesTable with assigned alias
|
||||
func (a *AllTypesTable) AS(alias string) *AllTypesTable {
|
||||
aliasTable := newAllTypesTable()
|
||||
|
||||
aliasTable.Table.AS(alias)
|
||||
|
||||
return aliasTable
|
||||
}
|
||||
|
||||
func newAllTypesTable() *AllTypesTable {
|
||||
var (
|
||||
SmallIntPtrColumn = postgres.IntegerColumn("small_int_ptr")
|
||||
SmallIntColumn = postgres.IntegerColumn("small_int")
|
||||
IntegerPtrColumn = postgres.IntegerColumn("integer_ptr")
|
||||
IntegerColumn = postgres.IntegerColumn("integer")
|
||||
BigIntPtrColumn = postgres.IntegerColumn("big_int_ptr")
|
||||
BigIntColumn = postgres.IntegerColumn("big_int")
|
||||
DecimalPtrColumn = postgres.FloatColumn("decimal_ptr")
|
||||
DecimalColumn = postgres.FloatColumn("decimal")
|
||||
NumericPtrColumn = postgres.FloatColumn("numeric_ptr")
|
||||
NumericColumn = postgres.FloatColumn("numeric")
|
||||
RealPtrColumn = postgres.FloatColumn("real_ptr")
|
||||
RealColumn = postgres.FloatColumn("real")
|
||||
DoublePrecisionPtrColumn = postgres.FloatColumn("double_precision_ptr")
|
||||
DoublePrecisionColumn = postgres.FloatColumn("double_precision")
|
||||
SmallserialColumn = postgres.IntegerColumn("smallserial")
|
||||
SerialColumn = postgres.IntegerColumn("serial")
|
||||
BigserialColumn = postgres.IntegerColumn("bigserial")
|
||||
VarCharPtrColumn = postgres.StringColumn("var_char_ptr")
|
||||
VarCharColumn = postgres.StringColumn("var_char")
|
||||
CharPtrColumn = postgres.StringColumn("char_ptr")
|
||||
CharColumn = postgres.StringColumn("char")
|
||||
TextPtrColumn = postgres.StringColumn("text_ptr")
|
||||
TextColumn = postgres.StringColumn("text")
|
||||
ByteaPtrColumn = postgres.StringColumn("bytea_ptr")
|
||||
ByteaColumn = postgres.StringColumn("bytea")
|
||||
TimestampzPtrColumn = postgres.TimestampzColumn("timestampz_ptr")
|
||||
TimestampzColumn = postgres.TimestampzColumn("timestampz")
|
||||
TimestampPtrColumn = postgres.TimestampColumn("timestamp_ptr")
|
||||
TimestampColumn = postgres.TimestampColumn("timestamp")
|
||||
DatePtrColumn = postgres.DateColumn("date_ptr")
|
||||
DateColumn = postgres.DateColumn("date")
|
||||
TimezPtrColumn = postgres.TimezColumn("timez_ptr")
|
||||
TimezColumn = postgres.TimezColumn("timez")
|
||||
TimePtrColumn = postgres.TimeColumn("time_ptr")
|
||||
TimeColumn = postgres.TimeColumn("time")
|
||||
IntervalPtrColumn = postgres.IntervalColumn("interval_ptr")
|
||||
IntervalColumn = postgres.IntervalColumn("interval")
|
||||
BooleanPtrColumn = postgres.BoolColumn("boolean_ptr")
|
||||
BooleanColumn = postgres.BoolColumn("boolean")
|
||||
PointPtrColumn = postgres.StringColumn("point_ptr")
|
||||
BitPtrColumn = postgres.StringColumn("bit_ptr")
|
||||
BitColumn = postgres.StringColumn("bit")
|
||||
BitVaryingPtrColumn = postgres.StringColumn("bit_varying_ptr")
|
||||
BitVaryingColumn = postgres.StringColumn("bit_varying")
|
||||
TsvectorPtrColumn = postgres.StringColumn("tsvector_ptr")
|
||||
TsvectorColumn = postgres.StringColumn("tsvector")
|
||||
UUIDPtrColumn = postgres.StringColumn("uuid_ptr")
|
||||
UUIDColumn = postgres.StringColumn("uuid")
|
||||
XMLPtrColumn = postgres.StringColumn("xml_ptr")
|
||||
XMLColumn = postgres.StringColumn("xml")
|
||||
JSONPtrColumn = postgres.StringColumn("json_ptr")
|
||||
JSONColumn = postgres.StringColumn("json")
|
||||
JsonbPtrColumn = postgres.StringColumn("jsonb_ptr")
|
||||
JsonbColumn = postgres.StringColumn("jsonb")
|
||||
IntegerArrayPtrColumn = postgres.StringColumn("integer_array_ptr")
|
||||
IntegerArrayColumn = postgres.StringColumn("integer_array")
|
||||
TextArrayPtrColumn = postgres.StringColumn("text_array_ptr")
|
||||
TextArrayColumn = postgres.StringColumn("text_array")
|
||||
JsonbArrayColumn = postgres.StringColumn("jsonb_array")
|
||||
TextMultiDimArrayPtrColumn = postgres.StringColumn("text_multi_dim_array_ptr")
|
||||
TextMultiDimArrayColumn = postgres.StringColumn("text_multi_dim_array")
|
||||
)
|
||||
|
||||
return &AllTypesTable{
|
||||
Table: postgres.NewTable("test_sample", "all_types", SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn),
|
||||
|
||||
//Columns
|
||||
SmallIntPtr: SmallIntPtrColumn,
|
||||
SmallInt: SmallIntColumn,
|
||||
IntegerPtr: IntegerPtrColumn,
|
||||
Integer: IntegerColumn,
|
||||
BigIntPtr: BigIntPtrColumn,
|
||||
BigInt: BigIntColumn,
|
||||
DecimalPtr: DecimalPtrColumn,
|
||||
Decimal: DecimalColumn,
|
||||
NumericPtr: NumericPtrColumn,
|
||||
Numeric: NumericColumn,
|
||||
RealPtr: RealPtrColumn,
|
||||
Real: RealColumn,
|
||||
DoublePrecisionPtr: DoublePrecisionPtrColumn,
|
||||
DoublePrecision: DoublePrecisionColumn,
|
||||
Smallserial: SmallserialColumn,
|
||||
Serial: SerialColumn,
|
||||
Bigserial: BigserialColumn,
|
||||
VarCharPtr: VarCharPtrColumn,
|
||||
VarChar: VarCharColumn,
|
||||
CharPtr: CharPtrColumn,
|
||||
Char: CharColumn,
|
||||
TextPtr: TextPtrColumn,
|
||||
Text: TextColumn,
|
||||
ByteaPtr: ByteaPtrColumn,
|
||||
Bytea: ByteaColumn,
|
||||
TimestampzPtr: TimestampzPtrColumn,
|
||||
Timestampz: TimestampzColumn,
|
||||
TimestampPtr: TimestampPtrColumn,
|
||||
Timestamp: TimestampColumn,
|
||||
DatePtr: DatePtrColumn,
|
||||
Date: DateColumn,
|
||||
TimezPtr: TimezPtrColumn,
|
||||
Timez: TimezColumn,
|
||||
TimePtr: TimePtrColumn,
|
||||
Time: TimeColumn,
|
||||
IntervalPtr: IntervalPtrColumn,
|
||||
Interval: IntervalColumn,
|
||||
BooleanPtr: BooleanPtrColumn,
|
||||
Boolean: BooleanColumn,
|
||||
PointPtr: PointPtrColumn,
|
||||
BitPtr: BitPtrColumn,
|
||||
Bit: BitColumn,
|
||||
BitVaryingPtr: BitVaryingPtrColumn,
|
||||
BitVarying: BitVaryingColumn,
|
||||
TsvectorPtr: TsvectorPtrColumn,
|
||||
Tsvector: TsvectorColumn,
|
||||
UUIDPtr: UUIDPtrColumn,
|
||||
UUID: UUIDColumn,
|
||||
XMLPtr: XMLPtrColumn,
|
||||
XML: XMLColumn,
|
||||
JSONPtr: JSONPtrColumn,
|
||||
JSON: JSONColumn,
|
||||
JsonbPtr: JsonbPtrColumn,
|
||||
Jsonb: JsonbColumn,
|
||||
IntegerArrayPtr: IntegerArrayPtrColumn,
|
||||
IntegerArray: IntegerArrayColumn,
|
||||
TextArrayPtr: TextArrayPtrColumn,
|
||||
TextArray: TextArrayColumn,
|
||||
JsonbArray: JsonbArrayColumn,
|
||||
TextMultiDimArrayPtr: TextMultiDimArrayPtrColumn,
|
||||
TextMultiDimArray: TextMultiDimArrayColumn,
|
||||
|
||||
AllColumns: postgres.ColumnList{SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn},
|
||||
MutableColumns: postgres.ColumnList{SmallIntPtrColumn, SmallIntColumn, IntegerPtrColumn, IntegerColumn, BigIntPtrColumn, BigIntColumn, DecimalPtrColumn, DecimalColumn, NumericPtrColumn, NumericColumn, RealPtrColumn, RealColumn, DoublePrecisionPtrColumn, DoublePrecisionColumn, SmallserialColumn, SerialColumn, BigserialColumn, VarCharPtrColumn, VarCharColumn, CharPtrColumn, CharColumn, TextPtrColumn, TextColumn, ByteaPtrColumn, ByteaColumn, TimestampzPtrColumn, TimestampzColumn, TimestampPtrColumn, TimestampColumn, DatePtrColumn, DateColumn, TimezPtrColumn, TimezColumn, TimePtrColumn, TimeColumn, IntervalPtrColumn, IntervalColumn, BooleanPtrColumn, BooleanColumn, PointPtrColumn, BitPtrColumn, BitColumn, BitVaryingPtrColumn, BitVaryingColumn, TsvectorPtrColumn, TsvectorColumn, UUIDPtrColumn, UUIDColumn, XMLPtrColumn, XMLColumn, JSONPtrColumn, JSONColumn, JsonbPtrColumn, JsonbColumn, IntegerArrayPtrColumn, IntegerArrayColumn, TextArrayPtrColumn, TextArrayColumn, JsonbArrayColumn, TextMultiDimArrayPtrColumn, TextMultiDimArrayColumn},
|
||||
}
|
||||
}
|
||||
`
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue