Skip to content

Commit e3f2b5d

Browse files
authored
Merge pull request #1233 from ydb-platform/gorm
upgraded gorm-driver
2 parents 9d88fe4 + 8e50f65 commit e3f2b5d

File tree

24 files changed

+148
-134
lines changed

24 files changed

+148
-134
lines changed

examples/auth/environ/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func main() {
1414
defer cancel()
1515
db, err := ydb.Open(ctx,
1616
os.Getenv("YDB_CONNECTION_STRING"),
17-
environ.WithEnvironCredentials(ctx),
17+
environ.WithEnvironCredentials(),
1818
)
1919
if err != nil {
2020
panic(err)

examples/basic/database_sql/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func main() {
2424

2525
cc, err := ydb.Open(ctx,
2626
dsn,
27-
environ.WithEnvironCredentials(ctx),
27+
environ.WithEnvironCredentials(),
2828
)
2929
if err != nil {
3030
panic(fmt.Errorf("connect error: %w", err))

examples/basic/gorm/main.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package main
22

33
import (
4-
"context"
54
"log"
65
"os"
7-
"time"
86

97
ydb "github.com/ydb-platform/gorm-driver"
108
environ "github.com/ydb-platform/ydb-go-sdk-auth-environ"
@@ -23,9 +21,6 @@ SQLITE_CONNECTION_STRING
2321
YDB_CONNECTION_STRING`
2422

2523
func main() {
26-
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
27-
defer cancel()
28-
2924
cfg := &gorm.Config{
3025
Logger: logger.Default.LogMode(logger.Error),
3126
}
@@ -43,7 +38,7 @@ func main() {
4338
dsn,
4439
ydb.WithTablePathPrefix("gorm"),
4540
ydb.With(
46-
environ.WithEnvironCredentials(ctx),
41+
environ.WithEnvironCredentials(),
4742
),
4843
),
4944
cfg,

examples/basic/native/query/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func main() {
5656

5757
db, err := ydb.Open(ctx,
5858
dsn,
59-
environ.WithEnvironCredentials(ctx),
59+
environ.WithEnvironCredentials(),
6060
)
6161
if err != nil {
6262
panic(fmt.Errorf("connect error: %w", err))

examples/basic/native/table/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func main() {
2323

2424
db, err := ydb.Open(ctx,
2525
dsn,
26-
environ.WithEnvironCredentials(ctx),
26+
environ.WithEnvironCredentials(),
2727
)
2828
if err != nil {
2929
panic(fmt.Errorf("connect error: %w", err))

examples/coordination/lock/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func main() {
6767
defer cancel()
6868

6969
db, err := ydb.Open(ctx, dsn,
70-
environ.WithEnvironCredentials(ctx),
70+
environ.WithEnvironCredentials(),
7171
)
7272
if err != nil {
7373
panic(fmt.Errorf("connect error: %w", err))

examples/coordination/workers/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func main() {
7979
defer cancel()
8080

8181
db, err := ydb.Open(ctx, dsn,
82-
environ.WithEnvironCredentials(ctx),
82+
environ.WithEnvironCredentials(),
8383
)
8484
if err != nil {
8585
panic(fmt.Errorf("connect error: %w", err))

examples/ddl/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func main() {
5555
ctx, cancel := context.WithCancel(context.Background())
5656
defer cancel()
5757
db, err := ydb.Open(ctx, dsn,
58-
environ.WithEnvironCredentials(ctx),
58+
environ.WithEnvironCredentials(),
5959
)
6060
if err != nil {
6161
panic(fmt.Errorf("connect error: %w", err))

examples/decimal/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func main() {
5959
ctx, cancel := context.WithCancel(context.Background())
6060
defer cancel()
6161
db, err := ydb.Open(ctx, dsn,
62-
environ.WithEnvironCredentials(ctx),
62+
environ.WithEnvironCredentials(),
6363
)
6464
if err != nil {
6565
panic(fmt.Errorf("connect error: %w", err))

examples/describe/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func main() {
7777
ctx, cancel := context.WithCancel(context.Background())
7878
defer cancel()
7979
db, err := ydb.Open(ctx, dsn,
80-
environ.WithEnvironCredentials(ctx),
80+
environ.WithEnvironCredentials(),
8181
)
8282
if err != nil {
8383
panic(fmt.Errorf("connect error: %w", err))

0 commit comments

Comments
 (0)