Merge branch 'main' into fix_issue_81

Author: jawad-arb123

README.md

@@ -10,7 +10,7 @@ To use ODPI-C with Godror, you’ll need to install the Oracle Instant Client on
 
 Follow the steps on [this page](https://odpi-c.readthedocs.io/en/latest/user_guide/installation.html) complete the installation.
 
-After that, use a logfmt-encoded parameter list to specify the instanct client directory in the `dataSourceName` when you connect to the database. For example:
+After that, use a logfmt-encoded parameter list to specify the instant client directory in the `dataSourceName` when you connect to the database. For example:
 
 ```go
 dsn := `user="scott" password="tiger" 

oracle/common.go

@@ -53,7 +53,7 @@ import (
 )
 
 // Helper function to get Oracle array type for a field
-func getOracleArrayType(field *schema.Field) string {
+func getOracleArrayType(field *schema.Field, values []any) string {
 	switch field.DataType {
 	case schema.Bool:
 		return "TABLE OF NUMBER(1)"
@@ -64,6 +64,14 @@ func getOracleArrayType(field *schema.Field) string {
 	case schema.String:
 		if field.Size > 0 && field.Size <= 4000 {
 			return fmt.Sprintf("TABLE OF VARCHAR2(%d)", field.Size)
+		} else {
+			for _, value := range values {
+				if strValue, ok := value.(string); ok {
+					if len(strValue) > 4000 {
+						return "TABLE OF CLOB"
+					}
+				}
+			}
 		}
 		return "TABLE OF VARCHAR2(4000)"
 	case schema.Time:

oracle/create.go

@@ -296,7 +296,7 @@ func buildBulkMergePLSQL(db *gorm.DB, createValues clause.Values, onConflictClau
 	for i, column := range createValues.Columns {
 		var arrayType string
 		if field := findFieldByDBName(schema, column.Name); field != nil {
-			arrayType = getOracleArrayType(field)
+			arrayType = getOracleArrayType(field, pluck(createValues.Values, i))
 		} else {
 			arrayType = "TABLE OF VARCHAR2(4000)"
 		}
@@ -579,7 +579,7 @@ func buildBulkInsertOnlyPLSQL(db *gorm.DB, createValues clause.Values) {
 	for i, column := range createValues.Columns {
 		var arrayType string
 		if field := findFieldByDBName(schema, column.Name); field != nil {
-			arrayType = getOracleArrayType(field)
+			arrayType = getOracleArrayType(field, pluck(createValues.Values, i))
 		} else {
 			arrayType = "TABLE OF VARCHAR2(4000)"
 		}
@@ -1007,3 +1007,12 @@ func sanitizeCreateValuesForBulkArrays(stmt *gorm.Statement, cv *clause.Values)
 		}
 	}
 }
+
+// pluck extracts the values at index col from a slice of arrays []T.
+func pluck[T any, N int](data [][]T, col int) []T {
+	out := make([]T, len(data))
+	for i := range data {
+		out[i] = data[i][col]
+	}
+	return out
+}

oracle/migrator.go

@@ -310,7 +310,7 @@ func (m Migrator) DropColumn(value interface{}, name string) error {
 		}
 
 		return m.DB.Exec(
-			"ALTER TABLE ? DROP ?",
+			"ALTER TABLE ? DROP COLUMN ?",
 			clause.Table{Name: stmt.Schema.Table},
 			clause.Column{Name: name},
 		).Error