Merge branch 'main' into joboon-CaseInsensitiveFieldMatching

ting-lan-wang · web-flow · commit 70a737734c4a · 2025-09-19T16:43:50.000-04:00
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -9,14 +9,15 @@ jobs:
       GORM_ORACLEDB_USER: ${{ secrets.GORM_ORACLEDB_USER }}
       GORM_ORACLEDB_PASSWORD: ${{ secrets.GORM_ORACLEDB_PASSWORD }}
       GORM_ORACLEDB_CONNECTSTRING: ${{ secrets.GORM_ORACLEDB_CONNECTSTRING }}
+      GORM_SYS_PASSOWRD: ${{ secrets.GORM_SYS_PASSOWRD }}
       GORM_ORACLEDB_LIBDIR: /home/runner/work/_temp/instantclient_23_9
     services:
       oracle:
         image: gvenzl/oracle-free:latest
         env:
           APP_USER: ${{ env.GORM_ORACLEDB_USER }}
           APP_USER_PASSWORD: ${{ env.GORM_ORACLEDB_PASSWORD }}
-          ORACLE_RANDOM_PASSWORD: yes
+          ORACLE_PASSWORD: ${{ env.GORM_SYS_PASSOWRD }}
         ports:
           - 1521:1521
     steps:
@@ -29,15 +30,38 @@ jobs:
     - name: Install Oracle Instant Client
       run: |
         cd $RUNNER_TEMP
-        # Download the desired Oracle Instant Client zip files
+        # Download the desired Oracle Instant Client zip files and SQL*Plus packages
         curl -sSfLO "https://download.oracle.com/otn_software/linux/instantclient/2390000/instantclient-basic-linux.x64-23.9.0.25.07.zip"
+        curl -sSfLO "https://download.oracle.com/otn_software/linux/instantclient/2390000/instantclient-sqlplus-linux.x64-23.9.0.25.07.zip"
         # Unzip the packages into a single directory
         unzip -q -o "instantclient-basic-linux.x64-23.9.0.25.07.zip"
+        unzip -q -o "instantclient-sqlplus-linux.x64-23.9.0.25.07.zip"
         # Install the operating system libaio package
         sudo ln -s /usr/lib/x86_64-linux-gnu/libaio.so.1t64 /usr/lib/libaio.so.1
         # Update the runtime link path
         echo "/home/runner/work/_temp/instantclient_23_9" | sudo tee /etc/ld.so.conf.d/oracle-instantclient.conf
         sudo ldconfig
+    
+    - name: Wait for Oracle to be ready
+      run: |
+        # Wait until Oracle is accepting connections
+        for i in {1..30}; do
+          if docker exec $(docker ps -qf "ancestor=gvenzl/oracle-free:latest") \
+            bash -c "echo exit | sqlplus -s / as sysdba" >/dev/null 2>&1; then
+            echo "Oracle is ready!"
+            break
+          fi
+          echo "Waiting for Oracle..."
+          sleep 10
+        done
+
+    - name: Alter user quota on tablespace SYSAUX
+      run: |
+        cat <<EOF > alter_user.sql
+        ALTER USER $GORM_ORACLEDB_USER QUOTA UNLIMITED ON SYSAUX;
+        EOF
+
+        $GORM_ORACLEDB_LIBDIR/sqlplus -s "sys/${GORM_SYS_PASSOWRD}@${GORM_ORACLEDB_CONNECTSTRING} AS SYSDBA" @alter_user.sql
 
     - name: Checkout
       uses: actions/checkout@v4
diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.24.4
 
 require (
 	github.com/godror/godror v0.49.3
+	github.com/google/uuid v1.6.0
 	gorm.io/datatypes v1.2.6
 	gorm.io/gorm v1.31.0
 )
@@ -14,7 +15,6 @@ require (
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/godror/knownpb v0.3.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
diff --git a/oracle/common.go b/oracle/common.go
@@ -46,6 +46,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/uuid"
 	"gorm.io/datatypes"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
@@ -165,10 +166,10 @@ func convertValue(val interface{}) interface{} {
 	}
 
 	// Dereference pointers
-	v := reflect.ValueOf(val)
-	for v.Kind() == reflect.Ptr && !v.IsNil() {
-		v = v.Elem()
-		val = v.Interface()
+	rv := reflect.ValueOf(val)
+	for rv.Kind() == reflect.Ptr && !rv.IsNil() {
+		rv = rv.Elem()
+		val = rv.Interface()
 	}
 
 	switch v := val.(type) {
@@ -183,6 +184,13 @@ func convertValue(val interface{}) interface{} {
 		}
 		b := []byte(*v)
 		return b
+	case *uuid.UUID, *datatypes.UUID:
+		// Convert nil pointer to a UUID to empty string so that it is stored in the database as NULL
+		// rather than "00000000-0000-0000-0000-000000000000"
+		if rv.IsNil() {
+			return ""
+		}
+		return val
 	case bool:
 		if v {
 			return 1
@@ -203,30 +211,13 @@ func convertFromOracleToField(value interface{}, field *schema.Field) interface{
 	}
 
 	targetType := field.FieldType
-	isPtr := targetType.Kind() == reflect.Ptr
+	var converted any
+
+	// dereference the field if it's a pointer
+	isPtr := field.FieldType.Kind() == reflect.Ptr
 	if isPtr {
-		targetType = targetType.Elem()
-	}
-	if field.FieldType == reflect.TypeOf(json.RawMessage{}) {
-		switch v := value.(type) {
-		case []byte:
-			return json.RawMessage(v) // from BLOB
-		case *[]byte:
-			if v == nil {
-				return json.RawMessage(nil)
-			}
-			return json.RawMessage(*v)
-		}
+		targetType = field.FieldType.Elem()
 	}
-	if isJSONField(field) {
-		switch v := value.(type) {
-		case string:
-			return datatypes.JSON([]byte(v))
-		case []byte:
-			return datatypes.JSON(v)
-		}
-	}
-	var converted interface{}
 
 	switch targetType {
 	case reflect.TypeOf(gorm.DeletedAt{}):
@@ -235,6 +226,33 @@ func convertFromOracleToField(value interface{}, field *schema.Field) interface{
 		} else {
 			converted = gorm.DeletedAt{}
 		}
+
+	case reflect.TypeOf(json.RawMessage{}):
+		if field.FieldType == reflect.TypeOf(json.RawMessage{}) {
+			switch vv := value.(type) {
+			case []byte:
+				converted = json.RawMessage(vv) // from BLOB
+			case *[]byte:
+				if vv == nil {
+					converted = json.RawMessage(nil)
+				}
+				converted = json.RawMessage(*vv)
+			case string:
+				return datatypes.JSON([]byte(vv))
+			default:
+				converted = value
+			}
+		}
+	case reflect.TypeOf(datatypes.JSON{}):
+		switch vv := value.(type) {
+		case string:
+			converted = datatypes.JSON([]byte(vv))
+		case []byte:
+			converted = datatypes.JSON(vv)
+		default:
+			converted = value
+		}
+
 	case reflect.TypeOf(time.Time{}):
 		switch vv := value.(type) {
 		case time.Time:
@@ -309,7 +327,12 @@ func isJSONField(f *schema.Field) bool {
 	if f == nil {
 		return false
 	}
+
 	ft := f.FieldType
+	if ft.Kind() == reflect.Ptr {
+		ft = ft.Elem()
+	}
+
 	return ft == _rawMsgT || ft == _gormJSON
 }
 
diff --git a/tests/json_bulk_test.go b/tests/json_bulk_test.go
@@ -50,20 +50,23 @@ import (
 
 func TestBasicCRUD_JSONText(t *testing.T) {
 	type JsonRecord struct {
-		ID         uint           `gorm:"primaryKey;autoIncrement;column:record_id"`
-		Name       string         `gorm:"column:name"`
-		Properties datatypes.JSON `gorm:"column:properties"`
+		ID            uint            `gorm:"primaryKey;autoIncrement;column:record_id"`
+		Name          string          `gorm:"column:name"`
+		Properties    datatypes.JSON  `gorm:"column:properties"`
+		PropertiesPtr *datatypes.JSON `gorm:"column:propertiesPtr"`
 	}
 
 	DB.Migrator().DropTable(&JsonRecord{})
-	if err := DB.AutoMigrate(&JsonRecord{}); err != nil {
+	if err := DB.Set("gorm:table_options", "TABLESPACE SYSAUX").AutoMigrate(&JsonRecord{}); err != nil {
 		t.Fatalf("migrate failed: %v", err)
 	}
 
 	// INSERT
+	json := datatypes.JSON([]byte(`{"env":"prod","owner":"team-x"}`))
 	rec := JsonRecord{
-		Name:       "json-text",
-		Properties: datatypes.JSON([]byte(`{"env":"prod","owner":"team-x"}`)),
+		Name:          "json-text",
+		Properties:    json,
+		PropertiesPtr: &json,
 	}
 	if err := DB.Create(&rec).Error; err != nil {
 		t.Fatalf("create failed: %v", err)
@@ -73,20 +76,23 @@ func TestBasicCRUD_JSONText(t *testing.T) {
 	}
 
 	// UPDATE (with RETURNING)
+	updateJson := datatypes.JSON([]byte(`{"env":"staging","owner":"team-y","flag":true}`))
 	var ret JsonRecord
 	if err := DB.
 		Clauses(clause.Returning{
 			Columns: []clause.Column{
 				{Name: "record_id"},
 				{Name: "name"},
 				{Name: "properties"},
+				{Name: "propertiesPtr"},
 			},
 		}).
 		Model(&ret).
 		Where("\"record_id\" = ?", rec.ID).
 		Updates(map[string]any{
-			"name":       "json-text-upd",
-			"properties": datatypes.JSON([]byte(`{"env":"staging","owner":"team-y","flag":true}`)),
+			"name":          "json-text-upd",
+			"properties":    updateJson,
+			"propertiesPtr": &updateJson,
 		}).Error; err != nil {
 		t.Fatalf("update returning failed: %v", err)
 	}
@@ -103,6 +109,7 @@ func TestBasicCRUD_JSONText(t *testing.T) {
 				{Name: "record_id"},
 				{Name: "name"},
 				{Name: "properties"},
+				{Name: "propertiesPtr"},
 			},
 		}).
 		Delete(&deleted).Error; err != nil {
@@ -122,20 +129,23 @@ func TestBasicCRUD_JSONText(t *testing.T) {
 
 func TestBasicCRUD_RawMessage(t *testing.T) {
 	type RawRecord struct {
-		ID         uint            `gorm:"primaryKey;autoIncrement;column:record_id"`
-		Name       string          `gorm:"column:name"`
-		Properties json.RawMessage `gorm:"column:properties"`
+		ID            uint             `gorm:"primaryKey;autoIncrement;column:record_id"`
+		Name          string           `gorm:"column:name"`
+		Properties    json.RawMessage  `gorm:"column:properties"`
+		PropertiesPtr *json.RawMessage `gorm:"column:propertiesPtr"`
 	}
 
 	DB.Migrator().DropTable(&RawRecord{})
 	if err := DB.AutoMigrate(&RawRecord{}); err != nil {
 		t.Fatalf("migrate failed: %v", err)
 	}
 
+	rawMsg := json.RawMessage(`{"a":1,"b":"x"}`)
 	// INSERT
 	rec := RawRecord{
-		Name:       "raw-json",
-		Properties: json.RawMessage(`{"a":1,"b":"x"}`),
+		Name:          "raw-json",
+		Properties:    rawMsg,
+		PropertiesPtr: &rawMsg,
 	}
 	if err := DB.Create(&rec).Error; err != nil {
 		t.Fatalf("create failed: %v", err)
@@ -145,24 +155,30 @@ func TestBasicCRUD_RawMessage(t *testing.T) {
 	}
 
 	// UPDATE (with RETURNING)
+	upatedRawMsg := json.RawMessage(`{"a":2,"c":true}`)
 	var ret RawRecord
 	if err := DB.
 		Clauses(clause.Returning{
 			Columns: []clause.Column{
 				{Name: "record_id"},
 				{Name: "name"},
 				{Name: "properties"},
+				{Name: "propertiesPtr"},
 			},
 		}).
 		Model(&ret).
 		Where("\"record_id\" = ?", rec.ID).
 		Updates(map[string]any{
-			"name":       "raw-json-upd",
-			"properties": json.RawMessage(`{"a":2,"c":true}`),
+			"name":          "raw-json-upd",
+			"properties":    upatedRawMsg,
+			"propertiesPtr": &upatedRawMsg,
 		}).Error; err != nil {
 		t.Fatalf("update returning failed: %v", err)
 	}
-	if ret.ID != rec.ID || ret.Name != "raw-json-upd" || len(ret.Properties) == 0 {
+	if ret.ID != rec.ID ||
+		ret.Name != "raw-json-upd" ||
+		len(ret.Properties) == 0 ||
+		ret.PropertiesPtr == nil || (ret.PropertiesPtr != nil && len(*ret.PropertiesPtr) == 0) {
 		t.Fatalf("unexpected returning row: %#v", ret)
 	}
 
@@ -175,6 +191,7 @@ func TestBasicCRUD_RawMessage(t *testing.T) {
 				{Name: "record_id"},
 				{Name: "name"},
 				{Name: "properties"},
+				{Name: "propertiesPtr"},
 			},
 		}).
 		Delete(&deleted).Error; err != nil {
diff --git a/tests/query_test.go b/tests/query_test.go
