Merge branch 'main' into hkhasnis-add-tests-error-translator

Author: Harshit-Khasnis

.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

.gitignore

@@ -0,0 +1 @@
+.vscode

README.md

@@ -36,6 +36,73 @@ func main() {
 }
 ```
 
+## Documentation
+
+### OnUpdate Foreign Key Constraint
+
+Since Oracle doesn’t support `ON UPDATE` in foreign keys, the driver simulates it using **triggers**.
+
+When a field has a constraint tagged with `OnUpdate`, the driver:
+
+1. Skips generating the unsupported `ON UPDATE` clause in the foreign key definition.
+2. Creates a trigger on the parent table that automatically cascades updates to the child table(s) whenever the referenced column is changed.
+
+The `OnUpdate` tag accepts the following values (case-insensitive): `CASCADE`, `SET NULL`, and `SET DEFAULT`.
+
+Take the following struct for an example:
+
+```go
+type Profile struct {
+  ID    uint
+  Name  string
+  Refer uint
+}
+
+type Member struct {
+  ID        uint
+  Name      string
+  ProfileID uint
+  Profile   Profile `gorm:"Constraint:OnUpdate:CASCADE"`
+}
+```
+
+Trigger SQL created by the driver when migrating:
+
+```sql
+CREATE OR REPLACE TRIGGER "fk_trigger_profiles_id_members_profile_id"
+AFTER UPDATE OF "id" ON "profiles"
+FOR EACH ROW
+BEGIN
+  UPDATE "members"
+  SET "profile_id" = :NEW."id"
+  WHERE "profile_id" = :OLD."id";
+END;
+```
+
+### JSON Columns
+
+Use either JSON type—both fully support `INSERT`, `UPDATE`, and `DELETE` … `RETURNING`:
+
+- `gorm.io/datatypes.JSON` — convenient for logging/printing; returned as text then rewrapped.
+- `encoding/json.RawMessage` — raw `[]byte` fast-path; ideal for large payloads or minimal decoding.
+
+#### Notes:
+- On multi-row `RETURNING`, we use PL/SQL bulk blocks and map results back into your structs.
+- `datatypes.JSON` comes back as text; `json.RawMessage` comes back as bytes.
+  
+Take the following struct as an example:
+
+```go
+type Record struct {
+  ID         uint            `gorm:"primaryKey;autoIncrement;column:record_id"`
+  Name       string          `gorm:"column:name"`
+  // Text-oriented JSON
+  Properties datatypes.JSON  `gorm:"column:properties"`
+  // Raw bytes JSON
+  Payload    json.RawMessage `gorm:"column:payload"`
+}
+```
+
 ## Contributing
 
 This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)

go.mod

@@ -2,18 +2,24 @@ module github.com/oracle-samples/gorm-oracle
 
 go 1.24.4
 
-require gorm.io/gorm v1.30.0
-
-require github.com/godror/godror v0.49.0
+require (
+	github.com/godror/godror v0.49.3
+	gorm.io/datatypes v1.2.6
+	gorm.io/gorm v1.31.0
+)
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/VictoriaMetrics/easyproto v0.1.4 // indirect
 	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-20250531010427-b6e5de432a8b // indirect
-	golang.org/x/term v0.27.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
+	golang.org/x/term v0.35.0 // indirect
+	golang.org/x/text v0.29.0 // indirect
+	google.golang.org/protobuf v1.36.9 // indirect
+	gorm.io/driver/mysql v1.5.6 // indirect
 )

go.sum

@@ -1,3 +1,5 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/UNO-SOFT/zlog v0.8.1 h1:TEFkGJHtUfTRgMkLZiAjLSHALjwSBdw6/zByMC5GJt4=
 github.com/UNO-SOFT/zlog v0.8.1/go.mod h1:yqFOjn3OhvJ4j7ArJqQNA+9V+u6t9zSAyIZdWdMweWc=
 github.com/VictoriaMetrics/easyproto v0.1.4 h1:r8cNvo8o6sR4QShBXQd1bKw/VVLSQma/V2KhTBPf+Sc=
@@ -6,29 +8,63 @@ github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi
 github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/godror/godror v0.49.0 h1:oXAzPOm7bAGdFGkTaePCRXv3dfyr6Agni++4XhaRcC8=
-github.com/godror/godror v0.49.0/go.mod h1:D4gKled+sJVcagT1HWibkBsO9PcLn2Nu96FCr1RtnzI=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/godror/godror v0.49.3 h1:84CPEu1p3qPvpN7PTHv8NDept+t+d+AoO/7WjYVsFNc=
+github.com/godror/godror v0.49.3/go.mod h1:kTMcxZzRw73RT5kn9v3JkBK4kHI6dqowHotqV72ebU8=
 github.com/godror/knownpb v0.3.0 h1:+caUdy8hTtl7X05aPl3tdL540TvCcaQA6woZQroLZMw=
 github.com/godror/knownpb v0.3.0/go.mod h1:PpTyfJwiOEAzQl7NtVCM8kdPCnp3uhxsZYIzZ5PV4zU=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
+github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw=
+github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 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.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA=
+github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
 github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc=
 github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68=
-golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b h1:QoALfVG9rhQ/M7vYDScfPdWjGL9dlsVVM5VGh7aKoAA=
-golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:U6Lno4MTRCDY+Ba7aCcauB9T60gsv5s4ralQzP72ZoQ=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
-gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs=
-gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
+golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
+golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
+golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
+google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
+google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
+gorm.io/datatypes v1.2.6 h1:KafLdXvFUhzNeL2ncm03Gl3eTLONQfNKZ+wJ+9Y4Nck=
+gorm.io/datatypes v1.2.6/go.mod h1:M2iO+6S3hhi4nAyYe444Pcb0dcIiOMJ7QHaUXxyiNZY=
+gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
+gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
+gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
+gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
+gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
+gorm.io/driver/sqlserver v1.6.0 h1:VZOBQVsVhkHU/NzNhRJKoANt5pZGQAS1Bwc6m6dgfnc=
+gorm.io/driver/sqlserver v1.6.0/go.mod h1:WQzt4IJo/WHKnckU9jXBLMJIVNMVeTu25dnOzehntWw=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.31.0 h1:0VlycGreVhK7RF/Bwt51Fk8v0xLiiiFdbGDPIZQ7mJY=
+gorm.io/gorm v1.31.0/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=

oracle/common.go

@@ -40,11 +40,13 @@ package oracle
 
 import (
 	"database/sql"
+	"encoding/json"
 	"fmt"
 	"reflect"
 	"strings"
 	"time"
 
+	"gorm.io/datatypes"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 )
@@ -169,11 +171,18 @@ func convertValue(val interface{}) interface{} {
 		val = v.Interface()
 	}
 
-	if v.Kind() == reflect.Ptr && v.IsNil() {
-		return nil
-	}
-
 	switch v := val.(type) {
+	case json.RawMessage:
+		if v == nil {
+			return nil
+		}
+		return []byte(v)
+	case *json.RawMessage:
+		if v == nil {
+			return nil
+		}
+		b := []byte(*v)
+		return b
 	case bool:
 		if v {
 			return 1
@@ -198,7 +207,25 @@ func convertFromOracleToField(value interface{}, field *schema.Field) interface{
 	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)
+		}
+	}
+	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 {
@@ -276,6 +303,24 @@ func convertFromOracleToField(value interface{}, field *schema.Field) interface{
 	return converted
 }
 
+func isJSONField(f *schema.Field) bool {
+	_rawMsgT := reflect.TypeOf(json.RawMessage{})
+	_gormJSON := reflect.TypeOf(datatypes.JSON{})
+	if f == nil {
+		return false
+	}
+	ft := f.FieldType
+	return ft == _rawMsgT || ft == _gormJSON
+}
+
+func isRawMessageField(f *schema.Field) bool {
+	t := f.FieldType
+	for t.Kind() == reflect.Ptr {
+		t = t.Elem()
+	}
+	return t == reflect.TypeOf(json.RawMessage(nil))
+}
+
 // Helper function to handle primitive type conversions
 func convertPrimitiveType(value interface{}, targetType reflect.Type) interface{} {
 	switch targetType.Kind() {
@@ -424,6 +469,12 @@ func writeQuotedIdentifier(builder *strings.Builder, identifier string) {
 	builder.WriteByte('"')
 }
 
+func QuoteIdentifier(identifier string) string {
+	var builder strings.Builder
+	writeQuotedIdentifier(&builder, identifier)
+	return builder.String()
+}
+
 // writeTableRecordCollectionDecl writes the PL/SQL declarations needed to
 // define a custom record type and a collection of that record type,
 // based on the schema of the given table.
@@ -448,19 +499,19 @@ func writeQuotedIdentifier(builder *strings.Builder, identifier string) {
 //   - plsqlBuilder: The builder to write the PL/SQL code into.
 //   - dbNames: The slice containing the column names.
 //   - table: The table name
-func writeTableRecordCollectionDecl(plsqlBuilder *strings.Builder, dbNames []string, table string) {
+func writeTableRecordCollectionDecl(db *gorm.DB, plsqlBuilder *strings.Builder, dbNames []string, table string) {
 	// Declare a record where each element has the same structure as a row from the given table
 	plsqlBuilder.WriteString("  TYPE t_record IS RECORD (\n")
 	for i, field := range dbNames {
 		if i > 0 {
 			plsqlBuilder.WriteString(",\n")
 		}
 		plsqlBuilder.WriteString("    ")
-		writeQuotedIdentifier(plsqlBuilder, field)
+		db.QuoteTo(plsqlBuilder, field)
 		plsqlBuilder.WriteString(" ")
-		writeQuotedIdentifier(plsqlBuilder, table)
+		db.QuoteTo(plsqlBuilder, table)
 		plsqlBuilder.WriteString(".")
-		writeQuotedIdentifier(plsqlBuilder, field)
+		db.QuoteTo(plsqlBuilder, field)
 		plsqlBuilder.WriteString("%TYPE")
 	}
 	plsqlBuilder.WriteString("\n")