From 6aa548ac4e4e43783b2a4deb5783cc3ffc5faa63 Mon Sep 17 00:00:00 2001 From: Dmitry Zenovich Date: Sun, 17 Nov 2024 18:02:22 +0300 Subject: [PATCH] use the latest version of Gorm from jinzhu/gorm instead of a patched version from France-ioi/gorm --- go.mod | 4 +--- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9ffeecc5a..b2fb51b0e 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,6 @@ exclude github.com/thingful/httpmock v0.0.2 exclude github.com/thingful/httpmock v0.0.1 -replace github.com/jinzhu/gorm v1.9.6 => github.com/France-ioi/gorm v0.0.0-20200829222212-0373d329b88b - require ( bou.ke/monkey v1.0.1 github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible @@ -29,7 +27,7 @@ require ( github.com/go-playground/universal-translator v0.16.0 github.com/go-sql-driver/mysql v1.6.0 github.com/google/go-cmp v0.5.9 - github.com/jinzhu/gorm v1.9.6 + github.com/jinzhu/gorm v1.9.17-0.20211120011537-5c235b72a414 github.com/lithammer/dedent v1.1.0 github.com/luna-duclos/instrumentedsql v1.1.3 github.com/pmezard/go-difflib v1.0.0 diff --git a/go.sum b/go.sum index f8aefaf1b..87ff47d76 100644 --- a/go.sum +++ b/go.sum @@ -9,8 +9,6 @@ github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible h1:rZ github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/DATA-DOG/go-sqlmock v1.3.2 h1:2L2f5t3kKnCLxnClDD/PrDfExFFa1wjESgxHG/B1ibo= github.com/DATA-DOG/go-sqlmock v1.3.2/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/France-ioi/gorm v0.0.0-20200829222212-0373d329b88b h1:oHUvv3VfWoZeeGE4WXorCqeDEmqUYuWJEODRKnCNfUg= -github.com/France-ioi/gorm v0.0.0-20200829222212-0373d329b88b/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/France-ioi/mapstructure v1.1.3-0.20190228185851-70b68b9b4003 h1:xWP0YlXTxXy/6cCYG52fFYHodOaAjmH5/09zTxPb42Q= github.com/France-ioi/mapstructure v1.1.3-0.20190228185851-70b68b9b4003/go.mod h1:MUWZRkw6DRv0+CydtqmPpc6Dn2/scLBrgCx5S7XqiaE= github.com/France-ioi/validator v9.29.2-0.20220110032854-1b7299b1a4db+incompatible h1:f5cCQN1Ky7J1627LCsU/YvHtDlYKb9gF1MKxpeD4jk0= @@ -103,6 +101,8 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jinzhu/gorm v1.9.17-0.20211120011537-5c235b72a414 h1:JkXdZo2OKW1t+GcTx5eb1kD2qW5lt1CDLrL2Ep9t+j4= +github.com/jinzhu/gorm v1.9.17-0.20211120011537-5c235b72a414/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=