@@ -9,7 +9,6 @@ type RFC3339Layout string
99func (t RFC3339Layout ) DataType () string {
1010 return "timestamp"
1111}
12-
1312func (t RFC3339Layout ) Layout () string {
1413 return carbon .RFC3339Layout
1514}
@@ -19,40 +18,39 @@ type ISO8601Format string
1918func (t ISO8601Format ) DataType () string {
2019 return "timestamp"
2120}
22-
2321func (t ISO8601Format ) Format () string {
2422 return carbon .ISO8601Format
2523}
2624
2725type MySQLModel1 struct {
2826 Id uint64 `json:"-" xorm:"pk autoincr"`
2927
30- Carbon1 carbon.Carbon `xorm:"varchar (50) carbon1" json:"carbon1"`
31- Carbon2 carbon.Carbon `xorm:"datetime carbon2" json:"carbon2"`
32- Carbon3 carbon.Carbon `xorm:"timestamp carbon3" json:"carbon3"`
28+ Carbon1 carbon.Carbon `xorm:"VARCHAR (50) carbon1" json:"carbon1"`
29+ Carbon2 carbon.Carbon `xorm:"DATETIME carbon2" json:"carbon2"`
30+ Carbon3 carbon.Carbon `xorm:"TIMESTAMP carbon3" json:"carbon3"`
3331
34- Date1 carbon.Date `xorm:"varchar (50) date1" json:"date1"`
35- Date2 carbon.Date `xorm:"date date2" json:"date2"`
36- Date3 carbon.Date `xorm:"timestamp date3" json:"date3"`
32+ Date1 carbon.Date `xorm:"VARCHAR (50) date1" json:"date1"`
33+ Date2 carbon.Date `xorm:"DATE date2" json:"date2"`
34+ Date3 carbon.Date `xorm:"TIMESTAMP date3" json:"date3"`
3735
38- Time1 carbon.Time `xorm:"varchar (50) time1" json:"time1"`
39- Time2 carbon.Time `xorm:"time time2" json:"time2"`
40- Time3 carbon.Time `xorm:"timestamp time3" json:"time3"`
36+ Time1 carbon.Time `xorm:"VARCHAR (50) time1" json:"time1"`
37+ Time2 carbon.Time `xorm:"TIME time2" json:"time2"`
38+ Time3 carbon.Time `xorm:"TIMESTAMP time3" json:"time3"`
4139
42- DateTime1 carbon.DateTime `xorm:"varchar (50) date_time1" json:"date_time1"`
43- DateTime2 carbon.DateTime `xorm:"datetime date_time2" json:"date_time2"`
44- DateTime3 carbon.DateTime `xorm:"timestamp date_time3" json:"date_time3"`
40+ DateTime1 carbon.DateTime `xorm:"VARCHAR (50) date_time1" json:"date_time1"`
41+ DateTime2 carbon.DateTime `xorm:"DATETIME date_time2" json:"date_time2"`
42+ DateTime3 carbon.DateTime `xorm:"TIMESTAMP date_time3" json:"date_time3"`
4543
46- RFC3339Layout1 carbon.LayoutType [RFC3339Layout ] `xorm:"varchar (50) rfc3339_layout1" json:"rfc3339_layout1"`
47- RFC3339Layout2 carbon.LayoutType [RFC3339Layout ] `xorm:"datetime rfc3339_layout2" json:"rfc3339_layout2"`
48- RFC3339Layout3 carbon.LayoutType [RFC3339Layout ] `xorm:"timestamp rfc3339_layout3" json:"rfc3339_layout3"`
44+ RFC3339Layout1 carbon.LayoutType [RFC3339Layout ] `xorm:"VARCHAR (50) rfc3339_layout1" json:"rfc3339_layout1"`
45+ RFC3339Layout2 carbon.LayoutType [RFC3339Layout ] `xorm:"DATETIME rfc3339_layout2" json:"rfc3339_layout2"`
46+ RFC3339Layout3 carbon.LayoutType [RFC3339Layout ] `xorm:"TIMESTAMP rfc3339_layout3" json:"rfc3339_layout3"`
4947
50- ISO8601Format1 carbon.FormatType [ISO8601Format ] `xorm:"varchar (50) iso8601_format1" json:"iso8601_format1"`
51- ISO8601Format2 carbon.FormatType [ISO8601Format ] `xorm:"datetime iso8601_format2" json:"iso8601_format2"`
52- ISO8601Format3 carbon.FormatType [ISO8601Format ] `xorm:"timestamp iso8601_format3" json:"iso8601_format3"`
48+ ISO8601Format1 carbon.FormatType [ISO8601Format ] `xorm:"VARCHAR (50) iso8601_format1" json:"iso8601_format1"`
49+ ISO8601Format2 carbon.FormatType [ISO8601Format ] `xorm:"DATETIME iso8601_format2" json:"iso8601_format2"`
50+ ISO8601Format3 carbon.FormatType [ISO8601Format ] `xorm:"TIMESTAMP iso8601_format3" json:"iso8601_format3"`
5351
54- Timestamp1 carbon.Timestamp `xorm:"timestamp timestamp1" json:"timestamp1"`
55- Timestamp2 carbon.Timestamp `xorm:"timestamp timestamp2" json:"timestamp2"`
52+ Timestamp1 carbon.Timestamp `xorm:"TIMESTAMP timestamp1" json:"timestamp1"`
53+ Timestamp2 carbon.Timestamp `xorm:"TIMESTAMP timestamp2" json:"timestamp2"`
5654
5755 CreatedAt carbon.DateTime `xorm:"created created_at" json:"-"`
5856 UpdatedAt carbon.DateTime `xorm:"updated updated_at" json:"-"`
@@ -66,32 +64,32 @@ func (MySQLModel1) TableName() string {
6664type MySQLModel2 struct {
6765 Id uint64 `json:"-" xorm:"pk autoincr"`
6866
69- Carbon1 * carbon.Carbon `xorm:"varchar (50) carbon1" json:"carbon1"`
70- Carbon2 * carbon.Carbon `xorm:"datetime carbon2" json:"carbon2"`
71- Carbon3 * carbon.Carbon `xorm:"timestamp carbon3" json:"carbon3"`
67+ Carbon1 * carbon.Carbon `xorm:"VARCHAR (50) carbon1" json:"carbon1"`
68+ Carbon2 * carbon.Carbon `xorm:"DATETIME carbon2" json:"carbon2"`
69+ Carbon3 * carbon.Carbon `xorm:"TIMESTAMP carbon3" json:"carbon3"`
7270
73- Date1 * carbon.Date `xorm:"varchar (50) date1" json:"date1"`
74- Date2 * carbon.Date `xorm:"date date2" json:"date2"`
75- Date3 * carbon.Date `xorm:"timestamp date3" json:"date3"`
71+ Date1 * carbon.Date `xorm:"VARCHAR (50) date1" json:"date1"`
72+ Date2 * carbon.Date `xorm:"DATE date2" json:"date2"`
73+ Date3 * carbon.Date `xorm:"TIMESTAMP date3" json:"date3"`
7674
77- Time1 * carbon.Time `xorm:"varchar (50) time1" json:"time1"`
78- Time2 * carbon.Time `xorm:"time time2" json:"time2"`
79- Time3 * carbon.Time `xorm:"timestamp time3" json:"time3"`
75+ Time1 * carbon.Time `xorm:"VARCHAR (50) time1" json:"time1"`
76+ Time2 * carbon.Time `xorm:"TIME time2" json:"time2"`
77+ Time3 * carbon.Time `xorm:"TIMESTAMP time3" json:"time3"`
8078
81- DateTime1 * carbon.DateTime `xorm:"varchar (50) date_time1" json:"date_time1"`
82- DateTime2 * carbon.DateTime `xorm:"datetime date_time2" json:"date_time2"`
83- DateTime3 * carbon.DateTime `xorm:"timestamp date_time3" json:"date_time3"`
79+ DateTime1 * carbon.DateTime `xorm:"VARCHAR (50) date_time1" json:"date_time1"`
80+ DateTime2 * carbon.DateTime `xorm:"DATETIME date_time2" json:"date_time2"`
81+ DateTime3 * carbon.DateTime `xorm:"TIMESTAMP date_time3" json:"date_time3"`
8482
85- RFC3339Layout1 * carbon.LayoutType [RFC3339Layout ] `xorm:"varchar (50) rfc3339_layout1" json:"rfc3339_layout1"`
86- RFC3339Layout2 * carbon.LayoutType [RFC3339Layout ] `xorm:"datetime rfc3339_layout2" json:"rfc3339_layout2"`
87- RFC3339Layout3 * carbon.LayoutType [RFC3339Layout ] `xorm:"timestamp rfc3339_layout3" json:"rfc3339_layout3"`
83+ RFC3339Layout1 * carbon.LayoutType [RFC3339Layout ] `xorm:"VARCHAR (50) rfc3339_layout1" json:"rfc3339_layout1"`
84+ RFC3339Layout2 * carbon.LayoutType [RFC3339Layout ] `xorm:"DATETIME rfc3339_layout2" json:"rfc3339_layout2"`
85+ RFC3339Layout3 * carbon.LayoutType [RFC3339Layout ] `xorm:"TIMESTAMP rfc3339_layout3" json:"rfc3339_layout3"`
8886
89- ISO8601Format1 * carbon.FormatType [ISO8601Format ] `xorm:"varchar (50) iso8601_format1" json:"iso8601_format1"`
90- ISO8601Format2 * carbon.FormatType [ISO8601Format ] `xorm:"datetime iso8601_format2" json:"iso8601_format2"`
91- ISO8601Format3 * carbon.FormatType [ISO8601Format ] `xorm:"timestamp iso8601_format3" json:"iso8601_format3"`
87+ ISO8601Format1 * carbon.FormatType [ISO8601Format ] `xorm:"VARCHAR (50) iso8601_format1" json:"iso8601_format1"`
88+ ISO8601Format2 * carbon.FormatType [ISO8601Format ] `xorm:"DATETIME iso8601_format2" json:"iso8601_format2"`
89+ ISO8601Format3 * carbon.FormatType [ISO8601Format ] `xorm:"TIMESTAMP iso8601_format3" json:"iso8601_format3"`
9290
93- Timestamp1 * carbon.Timestamp `xorm:"timestamp timestamp1" json:"timestamp1"`
94- Timestamp2 * carbon.Timestamp `xorm:"timestamp timestamp2" json:"timestamp2"`
91+ Timestamp1 * carbon.Timestamp `xorm:"TIMESTAMP timestamp1" json:"timestamp1"`
92+ Timestamp2 * carbon.Timestamp `xorm:"TIMESTAMP timestamp2" json:"timestamp2"`
9593
9694 CreatedAt * carbon.DateTime `xorm:"created created_at" json:"-"`
9795 UpdatedAt * carbon.DateTime `xorm:"updated updated_at" json:"-"`
@@ -105,25 +103,25 @@ func (MySQLModel2) TableName() string {
105103type PgSQLModel1 struct {
106104 Id uint64 `json:"-" xorm:"pk autoincr"`
107105
108- Carbon1 carbon.Carbon `gorm:"timestamp carbon1" json:"carbon1"`
109- Carbon2 carbon.Carbon `gorm:"timestamptz carbon2" json:"carbon2"`
106+ Carbon1 carbon.Carbon `xorm:"TIMESTAMP carbon1" json:"carbon1"`
107+ Carbon2 carbon.Carbon `xorm:"TIMESTAMPZ carbon2" json:"carbon2"`
110108
111- Date1 carbon.Date `gorm:"date date1" json:"date1"`
109+ Date1 carbon.Date `xorm:"DATE date1" json:"date1"`
112110
113- Time1 carbon.Time `gorm:"time time1" json:"time1"`
114- Time2 carbon.Time `gorm:"timetz time2" json:"time2"`
111+ Time1 carbon.Time `xorm:"TIME time1" json:"time1"`
112+ Time2 carbon.Time `xorm:"TIMEZ time2" json:"time2"`
115113
116- DateTime1 carbon.DateTime `gorm:"timestamp date_time1" json:"date_time1"`
117- DateTime2 carbon.DateTime `gorm:"timestamptz date_time2" json:"date_time2"`
114+ DateTime1 carbon.DateTime `xorm:"TIMESTAMP date_time1" json:"date_time1"`
115+ DateTime2 carbon.DateTime `xorm:"TIMESTAMPZ date_time2" json:"date_time2"`
118116
119- RFC3339Layout1 carbon.LayoutType [RFC3339Layout ] `gorm:"timestamp rfc3339_layout1" json:"rfc3339_layout1"`
120- RFC3339Layout2 carbon.LayoutType [RFC3339Layout ] `gorm:"timestamptz rfc3339_layout2" json:"rfc3339_layout2"`
117+ RFC3339Layout1 carbon.LayoutType [RFC3339Layout ] `xorm:"TIMESTAMP rfc3339_layout1" json:"rfc3339_layout1"`
118+ RFC3339Layout2 carbon.LayoutType [RFC3339Layout ] `xorm:"TIMESTAMPZ rfc3339_layout2" json:"rfc3339_layout2"`
121119
122- ISO8601Format1 carbon.FormatType [ISO8601Format ] `gorm:"timestamp iso8601_format1" json:"iso8601_format1"`
123- ISO8601Format2 carbon.FormatType [ISO8601Format ] `gorm:"timestamptz iso8601_format2" json:"iso8601_format2"`
120+ ISO8601Format1 carbon.FormatType [ISO8601Format ] `xorm:"TIMESTAMP iso8601_format1" json:"iso8601_format1"`
121+ ISO8601Format2 carbon.FormatType [ISO8601Format ] `xorm:"TIMESTAMPZ iso8601_format2" json:"iso8601_format2"`
124122
125- Timestamp1 carbon.Timestamp `gorm:"timestamp timestamp1" json:"timestamp1"`
126- Timestamp2 carbon.Timestamp `gorm:"timestamptz timestamp2" json:"timestamp2"`
123+ Timestamp1 carbon.Timestamp `xorm:"TIMESTAMP timestamp1" json:"timestamp1"`
124+ Timestamp2 carbon.Timestamp `xorm:"TIMESTAMPZ timestamp2" json:"timestamp2"`
127125
128126 CreatedAt carbon.DateTime `xorm:"created created_at" json:"-"`
129127 UpdatedAt carbon.DateTime `xorm:"updated updated_at" json:"-"`
@@ -137,25 +135,25 @@ func (PgSQLModel1) TableName() string {
137135type PgSQLModel2 struct {
138136 Id uint64 `json:"-" xorm:"pk autoincr"`
139137
140- Carbon1 * carbon.Carbon `gorm:"timestamp carbon1" json:"carbon1"`
141- Carbon2 * carbon.Carbon `gorm:"timestamptz carbon2" json:"carbon2"`
138+ Carbon1 * carbon.Carbon `xorm:"TIMESTAMP carbon1" json:"carbon1"`
139+ Carbon2 * carbon.Carbon `xorm:"TIMESTAMPZ carbon2" json:"carbon2"`
142140
143- Date1 * carbon.Date `gorm:"date date1" json:"date1"`
141+ Date1 * carbon.Date `xorm:"DATE date1" json:"date1"`
144142
145- Time1 * carbon.Time `gorm:"time time1" json:"time1"`
146- Time2 * carbon.Time `gorm:"timetz time2" json:"time2"`
143+ Time1 * carbon.Time `xorm:"TIME time1" json:"time1"`
144+ Time2 * carbon.Time `xorm:"TIMEZ time2" json:"time2"`
147145
148- DateTime1 * carbon.DateTime `gorm:"timestamp date_time1" json:"date_time1"`
149- DateTime2 * carbon.DateTime `gorm:"timestamptz date_time2" json:"date_time2"`
146+ DateTime1 * carbon.DateTime `xorm:"TIMESTAMP date_time1" json:"date_time1"`
147+ DateTime2 * carbon.DateTime `xorm:"TIMESTAMPZ date_time2" json:"date_time2"`
150148
151- RFC3339Layout1 * carbon.LayoutType [RFC3339Layout ] `gorm:"timestamp rfc3339_layout1" json:"rfc3339_layout1"`
152- RFC3339Layout2 * carbon.LayoutType [RFC3339Layout ] `gorm:"timestamptz rfc3339_layout2" json:"rfc3339_layout2"`
149+ RFC3339Layout1 * carbon.LayoutType [RFC3339Layout ] `xorm:"TIMESTAMP rfc3339_layout1" json:"rfc3339_layout1"`
150+ RFC3339Layout2 * carbon.LayoutType [RFC3339Layout ] `xorm:"TIMESTAMPZ rfc3339_layout2" json:"rfc3339_layout2"`
153151
154- ISO8601Format1 * carbon.FormatType [ISO8601Format ] `gorm:"timestamp iso8601_format1" json:"iso8601_format1"`
155- ISO8601Format2 * carbon.FormatType [ISO8601Format ] `gorm:"timestamptz iso8601_format2" json:"iso8601_format2"`
152+ ISO8601Format1 * carbon.FormatType [ISO8601Format ] `xorm:"TIMESTAMP iso8601_format1" json:"iso8601_format1"`
153+ ISO8601Format2 * carbon.FormatType [ISO8601Format ] `xorm:"TIMESTAMPZ iso8601_format2" json:"iso8601_format2"`
156154
157- Timestamp1 * carbon.Timestamp `gorm:"timestamp timestamp1" json:"timestamp1"`
158- Timestamp2 * carbon.Timestamp `gorm:"timestamptz timestamp2" json:"timestamp2"`
155+ Timestamp1 * carbon.Timestamp `xorm:"TIMESTAMP timestamp1" json:"timestamp1"`
156+ Timestamp2 * carbon.Timestamp `xorm:"TIMESTAMPZ timestamp2" json:"timestamp2"`
159157
160158 CreatedAt * carbon.DateTime `xorm:"created created_at" json:"-"`
161159 UpdatedAt * carbon.DateTime `xorm:"updated updated_at" json:"-"`
@@ -169,18 +167,18 @@ func (PgSQLModel2) TableName() string {
169167type SQLiteModel1 struct {
170168 Id uint64 `json:"-" xorm:"pk autoincr"`
171169
172- Carbon carbon.Carbon `xorm:"text carbon" json:"carbon"`
170+ Carbon carbon.Carbon `xorm:"TEXT carbon" json:"carbon"`
173171
174- Date carbon.Date `xorm:"text date" json:"date"`
172+ Date carbon.Date `xorm:"TEXT date" json:"date"`
175173
176- Time carbon.Time `xorm:"text time" json:"time"`
174+ Time carbon.Time `xorm:"TEXT time" json:"time"`
177175
178- DateTime carbon.DateTime `xorm:"text date_time" json:"date_time"`
176+ DateTime carbon.DateTime `xorm:"TEXT date_time" json:"date_time"`
179177
180- RFC3339Layout carbon.LayoutType [RFC3339Layout ] `xorm:"text rfc3339_layout" json:"rfc3339_layout"`
181- ISO8601Format carbon.FormatType [ISO8601Format ] `xorm:"text iso8601_format" json:"iso8601_format"`
178+ RFC3339Layout carbon.LayoutType [RFC3339Layout ] `xorm:"TEXT rfc3339_layout" json:"rfc3339_layout"`
179+ ISO8601Format carbon.FormatType [ISO8601Format ] `xorm:"TEXT iso8601_format" json:"iso8601_format"`
182180
183- Timestamp carbon.Timestamp `xorm:"text timestamp" json:"timestamp"`
181+ Timestamp carbon.Timestamp `xorm:"TEXT timestamp" json:"timestamp"`
184182
185183 CreatedAt carbon.DateTime `xorm:"created created_at" json:"-"`
186184 UpdatedAt carbon.DateTime `xorm:"updated updated_at" json:"-"`
@@ -194,18 +192,18 @@ func (SQLiteModel1) TableName() string {
194192type SQLiteModel2 struct {
195193 Id uint64 `json:"-" xorm:"pk autoincr"`
196194
197- Carbon * carbon.Carbon `xorm:"text carbon" json:"carbon"`
195+ Carbon * carbon.Carbon `xorm:"TEXT carbon" json:"carbon"`
198196
199- Date * carbon.Date `xorm:"text date" json:"date"`
197+ Date * carbon.Date `xorm:"TEXT date" json:"date"`
200198
201- Time * carbon.Time `xorm:"text time" json:"time"`
199+ Time * carbon.Time `xorm:"TEXT time" json:"time"`
202200
203- DateTime * carbon.DateTime `xorm:"text date_time" json:"date_time"`
201+ DateTime * carbon.DateTime `xorm:"TEXT date_time" json:"date_time"`
204202
205- RFC3339Layout * carbon.LayoutType [RFC3339Layout ] `xorm:"text rfc3339_layout" json:"rfc3339_layout"`
206- ISO8601Format * carbon.FormatType [ISO8601Format ] `xorm:"text iso8601_format" json:"iso8601_format"`
203+ RFC3339Layout * carbon.LayoutType [RFC3339Layout ] `xorm:"TEXT rfc3339_layout" json:"rfc3339_layout"`
204+ ISO8601Format * carbon.FormatType [ISO8601Format ] `xorm:"TEXT iso8601_format" json:"iso8601_format"`
207205
208- Timestamp * carbon.Timestamp `xorm:"text timestamp" json:"timestamp"`
206+ Timestamp * carbon.Timestamp `xorm:"TEXT timestamp" json:"timestamp"`
209207
210208 CreatedAt * carbon.DateTime `xorm:"created created_at" json:"-"`
211209 UpdatedAt * carbon.DateTime `xorm:"updated updated_at" json:"-"`
0 commit comments