Skip to content

Commit 96a1093

Browse files
deep110deep110
committed
change uint to uint64
1 parent afc7414 commit 96a1093

File tree

3 files changed

+35
-30
lines changed

3 files changed

+35
-30
lines changed

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.0
55
toolchain go1.23.6
66

77
require (
8-
github.com/Vernacular-ai/gorm v1.11.3
8+
github.com/Vernacular-ai/gorm v1.11.4
99
github.com/aws/aws-sdk-go v1.49.15
1010
github.com/getsentry/sentry-go v0.32.0
1111
github.com/go-kit/log v0.2.1
@@ -39,7 +39,6 @@ require (
3939
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
4040
github.com/cenkalti/backoff/v3 v3.2.2 // indirect
4141
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
42-
github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
4342
github.com/fatih/color v1.13.0 // indirect
4443
github.com/go-logfmt/logfmt v0.5.1 // indirect
4544
github.com/go-logr/logr v1.2.3 // indirect
@@ -73,7 +72,6 @@ require (
7372
github.com/hashicorp/vault/sdk v0.6.1 // indirect
7473
github.com/hashicorp/yamux v0.1.1 // indirect
7574
github.com/jinzhu/inflection v1.0.0 // indirect
76-
github.com/jinzhu/now v1.1.1 // indirect
7775
github.com/jmespath/go-jmespath v0.4.0 // indirect
7876
github.com/klauspost/compress v1.18.0 // indirect
7977
github.com/lib/pq v1.10.7 // indirect

‎go.sum‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3
194194
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
195195
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
196196
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
197-
github.com/Vernacular-ai/gorm v1.11.3 h1:cIBCy4XXESuFvqu189jr1y54+t4AMAvErtSKlwelNwI=
198-
github.com/Vernacular-ai/gorm v1.11.3/go.mod h1:3Z7XvgyWbLkVIreXrvxb+X7Fa87DEtBIGD8NyxTRFvo=
197+
github.com/Vernacular-ai/gorm v1.11.4 h1:lYXjuWPKNQJD4l71fidu5MCl0ELCKcKKoYWLruCd4zE=
198+
github.com/Vernacular-ai/gorm v1.11.4/go.mod h1:ntg/voSMFyfXipVUsmlZojez6JeL0FA3BZlUlNDnqwk=
199199
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
200200
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
201201
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
@@ -405,12 +405,8 @@ github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57Q
405405
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
406406
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
407407
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
408-
github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ=
409-
github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88=
410408
github.com/grafana/pyroscope-go v1.2.2 h1:uvKCyZMD724RkaCEMrSTC38Yn7AnFe8S2wiAIYdDPCE=
411409
github.com/grafana/pyroscope-go v1.2.2/go.mod h1:zzT9QXQAp2Iz2ZdS216UiV8y9uXJYQiGE1q8v1FyhqU=
412-
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
413-
github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
414410
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
415411
github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
416412
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
@@ -495,8 +491,8 @@ github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZ
495491
github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
496492
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
497493
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
498-
github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
499-
github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
494+
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
495+
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
500496
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
501497
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
502498
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -510,17 +506,15 @@ github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4d
510506
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
511507
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
512508
github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
513-
github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
514-
github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
515509
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
516510
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
517511
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
518512
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
519513
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
520514
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
521515
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
522-
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
523-
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
516+
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
517+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
524518
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
525519
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
526520
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -630,8 +624,9 @@ github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1Sd
630624
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
631625
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
632626
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
633-
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
634627
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
628+
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
629+
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
635630
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
636631
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
637632
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
@@ -642,8 +637,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
642637
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
643638
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
644639
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
645-
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
646-
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
640+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
641+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
647642
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
648643
github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
649644
github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=

‎vorm/model.go‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,22 @@ func initDBInternal(dialect string, dataSourceName string) (*Model, error) {
7070
}
7171

7272
// Represents a database agnostic primary key
73-
type Primary uint
73+
type Primary uint64
7474

7575
func (x *Primary) Scan(src interface{}) error {
76-
if val, ok := src.(uint); ok {
76+
if val, ok := src.(uint64); ok {
7777
*x = Primary(val)
78+
} else if val, ok := src.(uint); ok {
79+
*x = Primary(uint64(val))
7880
} else if val, ok := src.(float64); ok {
79-
// This happens due to oracle driver not knowing that uint is required by the calling code.
80-
*x = Primary(uint(val))
81+
// This happens due to oracle driver not knowing that uint64 is required by the calling code.
82+
*x = Primary(uint64(val))
8183
} else if val, ok := src.(int64); ok {
82-
*x = Primary(uint(val))
84+
*x = Primary(uint64(val))
8385
}
8486
// Note: This else results in errors while inserting into the table in oracle. Hence not using such a clause
8587
//else {
86-
// return errors.New(fmt.Sprintf("Unable to convert %v to uint", src))
88+
// return errors.New(fmt.Sprintf("Unable to convert %v to uint64", src))
8789
//}
8890

8991
return nil
@@ -97,25 +99,31 @@ func (x *Primary) Uint() uint {
9799
return uint(*x)
98100
}
99101

102+
func (x *Primary) Uint64() uint64 {
103+
return uint64(*x)
104+
}
105+
100106
func (x *Primary) Foreign() Foreign {
101107
return Foreign(*x)
102108
}
103109

104110
// Represents a database agnostic foreign key
105-
type Foreign uint
111+
type Foreign uint64
106112

107113
func (x *Foreign) Scan(src interface{}) error {
108-
if val, ok := src.(uint); ok {
114+
if val, ok := src.(uint64); ok {
109115
*x = Foreign(val)
116+
} else if val, ok := src.(uint); ok {
117+
*x = Foreign(uint64(val))
110118
} else if val, ok := src.(float64); ok {
111-
// This happens due to oracle driver not knowing that uint is required by the calling code.
112-
*x = Foreign(uint(val))
119+
// This happens due to oracle driver not knowing that uint64 is required by the calling code.
120+
*x = Foreign(uint64(val))
113121
} else if val, ok := src.(int64); ok {
114-
*x = Foreign(uint(val))
122+
*x = Foreign(uint64(val))
115123
}
116124
// Note: This else results in errors while inserting into the table in oracle. Hence not using such a clause
117125
//else {
118-
// return errors.New(fmt.Sprintf("Unable to convert %v to uint", src))
126+
// return errors.New(fmt.Sprintf("Unable to convert %v to uint64", src))
119127
//}
120128

121129
return nil
@@ -129,6 +137,10 @@ func (x *Foreign) Uint() uint {
129137
return uint(*x)
130138
}
131139

140+
func (x *Foreign) Uint64() uint64 {
141+
return uint64(*x)
142+
}
143+
132144
func (x *Foreign) Primary() Primary {
133145
return Primary(*x)
134146
}

0 commit comments

Comments
 (0)