Skip to content

Commit dd45741

Browse files
gogingersnap777gogingersnap777
authored
Removing data_helpers.go and all references (#1315)
1 parent 49e6265 commit dd45741

File tree

7 files changed

+6
-165
lines changed

7 files changed

+6
-165
lines changed

‎lib/column/date.go‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"database/sql"
2222
"database/sql/driver"
2323
"fmt"
24-
"github.com/ClickHouse/ch-go/proto"
2524
"reflect"
2625
"time"
26+
27+
"github.com/ClickHouse/ch-go/proto"
2728
)
2829

2930
var (
@@ -101,19 +102,13 @@ func (col *Date) Append(v any) (nulls []uint8, err error) {
101102
switch v := v.(type) {
102103
case []time.Time:
103104
for _, t := range v {
104-
if err := dateOverflow(minDate, maxDate, t, defaultDateFormatNoZone); err != nil {
105-
return nil, err
106-
}
107105
col.col.Append(t)
108106
}
109107
case []*time.Time:
110108
nulls = make([]uint8, len(v))
111109
for i, v := range v {
112110
switch {
113111
case v != nil:
114-
if err := dateOverflow(minDate, maxDate, *v, defaultDateFormatNoZone); err != nil {
115-
return nil, err
116-
}
117112
col.col.Append(*v)
118113
default:
119114
nulls[i] = 1
@@ -181,16 +176,10 @@ func (col *Date) Append(v any) (nulls []uint8, err error) {
181176
func (col *Date) AppendRow(v any) error {
182177
switch v := v.(type) {
183178
case time.Time:
184-
if err := dateOverflow(minDate, maxDate, v, defaultDateFormatNoZone); err != nil {
185-
return err
186-
}
187179
col.col.Append(v)
188180
case *time.Time:
189181
switch {
190182
case v != nil:
191-
if err := dateOverflow(minDate, maxDate, *v, defaultDateFormatNoZone); err != nil {
192-
return err
193-
}
194183
col.col.Append(*v)
195184
default:
196185
col.col.Append(time.Time{})
@@ -257,12 +246,6 @@ func parseDate(value string, minDate time.Time, maxDate time.Time, location *tim
257246
if location == nil {
258247
location = time.Local
259248
}
260-
261-
defer func() {
262-
if err == nil {
263-
err = dateOverflow(minDate, maxDate, tv, defaultDateFormatNoZone)
264-
}
265-
}()
266249
if tv, err = time.Parse(defaultDateFormatWithZone, value); err == nil {
267250
return tv, nil
268251
}

‎lib/column/date32.go‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,13 @@ func (col *Date32) Append(v any) (nulls []uint8, err error) {
9292
switch v := v.(type) {
9393
case []time.Time:
9494
for _, t := range v {
95-
if err := dateOverflow(minDate32, maxDate32, t, "2006-01-02"); err != nil {
96-
return nil, err
97-
}
9895
col.col.Append(t)
9996
}
10097
case []*time.Time:
10198
nulls = make([]uint8, len(v))
10299
for i, v := range v {
103100
switch {
104101
case v != nil:
105-
if err := dateOverflow(minDate32, maxDate32, *v, "2006-01-02"); err != nil {
106-
return nil, err
107-
}
108102
col.col.Append(*v)
109103
default:
110104
nulls[i] = 1
@@ -172,16 +166,10 @@ func (col *Date32) Append(v any) (nulls []uint8, err error) {
172166
func (col *Date32) AppendRow(v any) error {
173167
switch v := v.(type) {
174168
case time.Time:
175-
if err := dateOverflow(minDate32, maxDate32, v, "2006-01-02"); err != nil {
176-
return err
177-
}
178169
col.col.Append(v)
179170
case *time.Time:
180171
switch {
181172
case v != nil:
182-
if err := dateOverflow(minDate32, maxDate32, *v, "2006-01-02"); err != nil {
183-
return err
184-
}
185173
col.col.Append(*v)
186174
default:
187175
col.col.Append(time.Time{})

‎lib/column/date_helpers.go‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎lib/column/date_helpers_test.go‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎lib/column/datetime.go‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121
"database/sql"
2222
"database/sql/driver"
2323
"fmt"
24-
"github.com/ClickHouse/ch-go/proto"
2524
"reflect"
2625
"strings"
2726
"time"
2827

28+
"github.com/ClickHouse/ch-go/proto"
29+
2930
"github.com/ClickHouse/clickhouse-go/v2/lib/timezone"
3031
)
3132

@@ -131,9 +132,6 @@ func (col *DateTime) Append(v any) (nulls []uint8, err error) {
131132
case []time.Time:
132133
nulls = make([]uint8, len(v))
133134
for i := range v {
134-
if err := dateOverflow(minDateTime, maxDateTime, v[i], defaultDateTimeFormatNoZone); err != nil {
135-
return nil, err
136-
}
137135
col.col.Append(v[i])
138136
}
139137

@@ -142,9 +140,6 @@ func (col *DateTime) Append(v any) (nulls []uint8, err error) {
142140
for i := range v {
143141
switch {
144142
case v[i] != nil:
145-
if err := dateOverflow(minDateTime, maxDateTime, *v[i], defaultDateTimeFormatNoZone); err != nil {
146-
return nil, err
147-
}
148143
col.col.Append(*v[i])
149144
default:
150145
nulls[i] = 1
@@ -223,16 +218,10 @@ func (col *DateTime) AppendRow(v any) error {
223218
col.col.Append(time.Time{})
224219
}
225220
case time.Time:
226-
if err := dateOverflow(minDateTime, maxDateTime, v, defaultDateTimeFormatNoZone); err != nil {
227-
return err
228-
}
229221
col.col.Append(v)
230222
case *time.Time:
231223
switch {
232224
case v != nil:
233-
if err := dateOverflow(minDateTime, maxDateTime, *v, defaultDateTimeFormatNoZone); err != nil {
234-
return err
235-
}
236225
col.col.Append(*v)
237226
default:
238227
col.col.Append(time.Time{})
@@ -309,12 +298,6 @@ func (col *DateTime) row(i int) time.Time {
309298
}
310299

311300
func (col *DateTime) parseDateTime(value string) (tv time.Time, err error) {
312-
defer func() {
313-
if err == nil {
314-
err = dateOverflow(minDateTime, maxDateTime, tv, defaultDateFormatNoZone)
315-
}
316-
}()
317-
318301
if tv, err = time.Parse(defaultDateTimeFormatWithZone, value); err == nil {
319302
return tv, nil
320303
}

‎lib/column/datetime64.go‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ import (
2121
"database/sql"
2222
"database/sql/driver"
2323
"fmt"
24-
"github.com/ClickHouse/ch-go/proto"
2524
"math"
2625
"reflect"
2726
"strconv"
2827
"strings"
2928
"time"
3029

30+
"github.com/ClickHouse/ch-go/proto"
31+
3132
"github.com/ClickHouse/clickhouse-go/v2/lib/timezone"
3233
)
3334

@@ -152,19 +153,13 @@ func (col *DateTime64) Append(v any) (nulls []uint8, err error) {
152153
case []time.Time:
153154
nulls = make([]uint8, len(v))
154155
for i := range v {
155-
if err := dateOverflow(minDateTime64, maxDateTime64, v[i], "2006-01-02 15:04:05"); err != nil {
156-
return nil, err
157-
}
158156
col.col.Append(v[i])
159157
}
160158
case []*time.Time:
161159
nulls = make([]uint8, len(v))
162160
for i := range v {
163161
switch {
164162
case v[i] != nil:
165-
if err := dateOverflow(minDateTime64, maxDateTime64, *v[i], "2006-01-02 15:04:05"); err != nil {
166-
return nil, err
167-
}
168163
col.col.Append(*v[i])
169164
default:
170165
col.col.Append(time.Time{})
@@ -227,16 +222,10 @@ func (col *DateTime64) AppendRow(v any) error {
227222
col.col.Append(time.Time{})
228223
}
229224
case time.Time:
230-
if err := dateOverflow(minDateTime64, maxDateTime64, v, "2006-01-02 15:04:05"); err != nil {
231-
return err
232-
}
233225
col.col.Append(v)
234226
case *time.Time:
235227
switch {
236228
case v != nil:
237-
if err := dateOverflow(minDateTime64, maxDateTime64, *v, "2006-01-02 15:04:05"); err != nil {
238-
return err
239-
}
240229
col.col.Append(*v)
241230
default:
242231
col.col.Append(time.Time{})

‎lib/proto/block.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ func (e *BlockError) Error() string {
301301
switch err := e.Err.(type) {
302302
case *column.Error:
303303
return fmt.Sprintf("clickhouse [%s]: (%s %s) %s", e.Op, e.ColumnName, err.ColumnType, err.Err)
304-
case *column.DateOverflowError:
305-
return fmt.Sprintf("clickhouse: dateTime overflow. %s must be between %s and %s", e.ColumnName, err.Min.Format(err.Format), err.Max.Format(err.Format))
306304
}
307305
return fmt.Sprintf("clickhouse [%s]: %s %s", e.Op, e.ColumnName, e.Err)
308306
}

0 commit comments

Comments
 (0)