Skip to content

Commit 05163e3

Browse files
aarrasseayoub01aarrasseayoub01
committed
Merge branch 'main' of https://github.com/oracle-samples/gorm-oracle into null-returned-value
2 parents cfe790b + a9736f5 commit 05163e3

29 files changed

+152
-9
lines changed

‎.github/workflows/run-tests.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Run Tests
2+
3+
on: push
4+
5+
jobs:
6+
run-tests:
7+
runs-on: ubuntu-latest
8+
env:
9+
GORM_ORACLEDB_USER: ${{ secrets.GORM_ORACLEDB_USER }}
10+
GORM_ORACLEDB_PASSWORD: ${{ secrets.GORM_ORACLEDB_PASSWORD }}
11+
GORM_ORACLEDB_CONNECTSTRING: ${{ secrets.GORM_ORACLEDB_CONNECTSTRING }}
12+
GORM_ORACLEDB_LIBDIR: /home/runner/work/_temp/instantclient_23_9
13+
services:
14+
oracle:
15+
image: gvenzl/oracle-free:latest
16+
env:
17+
APP_USER: ${{ env.GORM_ORACLEDB_USER }}
18+
APP_USER_PASSWORD: ${{ env.GORM_ORACLEDB_PASSWORD }}
19+
ORACLE_RANDOM_PASSWORD: yes
20+
ports:
21+
- 1521:1521
22+
steps:
23+
24+
- name: Set up Go
25+
uses: actions/setup-go@v4
26+
with:
27+
go-version: '1.24.4'
28+
29+
- name: Install Oracle Instant Client
30+
run: |
31+
cd $RUNNER_TEMP
32+
# Download the desired Oracle Instant Client zip files
33+
curl -sSfLO "https://download.oracle.com/otn_software/linux/instantclient/2390000/instantclient-basic-linux.x64-23.9.0.25.07.zip"
34+
# Unzip the packages into a single directory
35+
unzip -q -o "instantclient-basic-linux.x64-23.9.0.25.07.zip"
36+
# Install the operating system libaio package
37+
sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/libaio.so.1
38+
# Update the runtime link path
39+
echo "/home/runner/work/_temp/instantclient_23_9" | sudo tee /etc/ld.so.conf.d/oracle-instantclient.conf
40+
sudo ldconfig
41+
42+
- name: Checkout
43+
uses: actions/checkout@v4
44+
45+
- name: Run all tests under tests directory
46+
run: |
47+
cd tests
48+
go get -t github.com/oracle-samples/gorm-oracle/tests
49+
go get .
50+
go test -failfast

‎oracle/oracle.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@ func (d Dialector) Migrator(db *gorm.DB) gorm.Migrator {
133133

134134
// Determines the data type for a schema field
135135
func (d Dialector) DataTypeOf(field *schema.Field) string {
136-
// TODO : Not sure why this is added in the reference implementation
137-
if _, found := field.TagSettings["RESTRICT"]; found {
138-
delete(field.TagSettings, "RESTRICT")
139-
}
140-
141136
switch field.DataType {
142137
case schema.Bool:
143138
return d.getBooleanType()

‎tests/associations_has_many_test.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import (
4747
)
4848

4949
func TestHasManyAssociation(t *testing.T) {
50+
t.Skip()
5051
user := *GetUser("hasmany", Config{Pets: 2})
5152

5253
if err := DB.Create(&user).Error; err != nil {
@@ -159,6 +160,7 @@ func TestHasManyAssociation(t *testing.T) {
159160
}
160161

161162
func TestSingleTableHasManyAssociation(t *testing.T) {
163+
t.Skip()
162164
user := *GetUser("hasmany", Config{Team: 2})
163165

164166
if err := DB.Create(&user).Error; err != nil {
@@ -254,6 +256,7 @@ func TestSingleTableHasManyAssociation(t *testing.T) {
254256
}
255257

256258
func TestHasManyAssociationForSlice(t *testing.T) {
259+
t.Skip()
257260
users := []User{
258261
*GetUser("slice-hasmany-1", Config{Pets: 2}),
259262
*GetUser("slice-hasmany-2", Config{Pets: 0}),
@@ -308,6 +311,7 @@ func TestHasManyAssociationForSlice(t *testing.T) {
308311
}
309312

310313
func TestSingleTableHasManyAssociationForSlice(t *testing.T) {
314+
t.Skip()
311315
users := []User{
312316
*GetUser("slice-hasmany-1", Config{Team: 2}),
313317
*GetUser("slice-hasmany-2", Config{Team: 0}),
@@ -364,6 +368,7 @@ func TestSingleTableHasManyAssociationForSlice(t *testing.T) {
364368
}
365369

366370
func TestPolymorphicHasManyAssociation(t *testing.T) {
371+
t.Skip()
367372
user := *GetUser("hasmany", Config{Toys: 2})
368373

369374
if err := DB.Create(&user).Error; err != nil {
@@ -459,6 +464,7 @@ func TestPolymorphicHasManyAssociation(t *testing.T) {
459464
}
460465

461466
func TestPolymorphicHasManyAssociationForSlice(t *testing.T) {
467+
t.Skip()
462468
users := []User{
463469
*GetUser("slice-hasmany-1", Config{Toys: 2}),
464470
*GetUser("slice-hasmany-2", Config{Toys: 0, Tools: 2}),
@@ -595,6 +601,7 @@ func TestHasManyAssociationUnscoped(t *testing.T) {
595601
}
596602

597603
func TestHasManyAssociationReplaceWithNonValidValue(t *testing.T) {
604+
t.Skip()
598605
user := User{Name: "jinzhu", Languages: []Language{{Name: "EN"}}}
599606

600607
if err := DB.Create(&user).Error; err != nil {

‎tests/associations_many2many_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ func TestMany2ManyAssociationForSlice(t *testing.T) {
235235
}
236236

237237
func TestSingleTableMany2ManyAssociation(t *testing.T) {
238+
t.Skip()
238239
user := *GetUser("many2many", Config{Friends: 2})
239240

240241
if err := DB.Create(&user).Error; err != nil {
@@ -316,6 +317,7 @@ func TestSingleTableMany2ManyAssociation(t *testing.T) {
316317
}
317318

318319
func TestSingleTableMany2ManyAssociationForSlice(t *testing.T) {
320+
t.Skip()
319321
users := []User{
320322
*GetUser("slice-many2many-1", Config{Team: 2}),
321323
*GetUser("slice-many2many-2", Config{Team: 0}),
@@ -370,6 +372,7 @@ func TestSingleTableMany2ManyAssociationForSlice(t *testing.T) {
370372
}
371373

372374
func TestDuplicateMany2ManyAssociation(t *testing.T) {
375+
t.Skip()
373376
user1 := User{Name: "TestDuplicateMany2ManyAssociation-1", Languages: []Language{
374377
{Code: "TestDuplicateMany2ManyAssociation-language-1"},
375378
{Code: "TestDuplicateMany2ManyAssociation-language-2"},
@@ -433,6 +436,7 @@ func TestConcurrentMany2ManyAssociation(t *testing.T) {
433436
}
434437

435438
func TestMany2ManyDuplicateBelongsToAssociation(t *testing.T) {
439+
t.Skip()
436440
user1 := User{Name: "TestMany2ManyDuplicateBelongsToAssociation-1", Friends: []*User{
437441
{Name: "TestMany2ManyDuplicateBelongsToAssociation-friend-1", Company: Company{
438442
ID: 1,

‎tests/associations_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ func TestAssociationNotNullClear(t *testing.T) {
112112
}
113113

114114
func TestForeignKeyConstraints(t *testing.T) {
115+
t.Skip()
115116
type Profile struct {
116117
ID uint
117118
Name string
@@ -167,6 +168,7 @@ func TestForeignKeyConstraints(t *testing.T) {
167168
}
168169

169170
func TestForeignKeyConstraintsBelongsTo(t *testing.T) {
171+
t.Skip()
170172
type Profile struct {
171173
ID uint
172174
Name string
@@ -221,6 +223,7 @@ func TestForeignKeyConstraintsBelongsTo(t *testing.T) {
221223
}
222224

223225
func TestFullSaveAssociations(t *testing.T) {
226+
t.Skip()
224227
coupon := &Coupon{
225228
AppliesToProduct: []*CouponProduct{
226229
{ProductId: "full-save-association-product1"},

‎tests/connection_pool_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ type TestCategory struct {
2424
}
2525

2626
func TestConnectionPooling(t *testing.T) {
27+
t.Skip()
2728
setupConnectionPoolTestTables(t)
2829

2930
sqlDB, err := DB.DB()

‎tests/create_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ func TestCreateFromMap(t *testing.T) {
181181
}
182182

183183
func TestCreateWithAssociations(t *testing.T) {
184+
t.Skip()
184185
user := *GetUser("create_with_associations", Config{
185186
Account: true,
186187
Pets: 2,
@@ -264,6 +265,7 @@ func TestBulkCreatePtrDataWithAssociations(t *testing.T) {
264265
}
265266

266267
func TestPolymorphicHasOne(t *testing.T) {
268+
t.Skip()
267269
t.Run("Struct", func(t *testing.T) {
268270
pet := Pet{
269271
Name: "PolymorphicHasOne",

‎tests/customize_field_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestCustomizeColumn(t *testing.T) {
6565
}
6666

6767
var cc1 CustomizeColumn
68-
DB.First(&cc1, "mapped_name = ?", "foo")
68+
DB.First(&cc1, "\"mapped_name\" = ?", "foo")
6969

7070
if cc1.Name != expected {
7171
t.Errorf("Failed to query CustomizeColumn")
@@ -75,7 +75,7 @@ func TestCustomizeColumn(t *testing.T) {
7575
DB.Save(&cc)
7676

7777
var cc2 CustomizeColumn
78-
DB.First(&cc2, "mapped_id = ?", 666)
78+
DB.First(&cc2, "\"mapped_id\" = ?", 666)
7979
if cc2.Name != "bar" {
8080
t.Errorf("Failed to query CustomizeColumn")
8181
}

‎tests/delete_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ func TestDeleteSliceWithAssociations(t *testing.T) {
248248

249249
// only sqlite, postgres, sqlserver support returning
250250
func TestSoftDeleteReturning(t *testing.T) {
251+
t.Skip()
251252
users := []*User{
252253
GetUser("delete-returning-1", Config{}),
253254
GetUser("delete-returning-2", Config{}),
@@ -418,6 +419,7 @@ func TestHardDeleteAfterSoftDelete(t *testing.T) {
418419
}
419420

420421
func TestDeleteWithLimitAndOrder(t *testing.T) {
422+
RunMigrations()
421423
users := []User{
422424
*GetUser("del-limited-1", Config{}),
423425
*GetUser("del-limited-2", Config{}),
@@ -437,6 +439,7 @@ func TestDeleteWithLimitAndOrder(t *testing.T) {
437439
}
438440

439441
func TestRawSQLDeleteWithLimit(t *testing.T) {
442+
RunMigrations()
440443
users := []User{
441444
*GetUser("del-limited-1", Config{}),
442445
*GetUser("del-limited-2", Config{}),

‎tests/distinct_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ func TestDistinct(t *testing.T) {
114114
}
115115

116116
func TestDistinctWithVaryingCase(t *testing.T) {
117+
RunMigrations()
117118
users := []User{
118119
{Name: "Alpha"},
119120
{Name: "alpha"},
@@ -137,6 +138,7 @@ func TestDistinctWithVaryingCase(t *testing.T) {
137138
}
138139

139140
func TestDistinctComputedColumn(t *testing.T) {
141+
t.Skip()
140142
type UserWithComputationColumn struct {
141143
ID int64 `gorm:"primary_key"`
142144
Name string
@@ -172,6 +174,7 @@ func TestDistinctComputedColumn(t *testing.T) {
172174
}
173175

174176
func TestDistinctWithAggregation(t *testing.T) {
177+
t.Skip()
175178
type UserWithComputationColumn struct {
176179
ID int64 `gorm:"primaryKey"`
177180
Name string

0 commit comments

Comments
 (0)