code refactoring

Author: jawad-arb123

oracle/migrator.go

@@ -484,31 +484,23 @@ func (m Migrator) DropConstraint(value interface{}, name string) error {
 	return m.Migrator.DropConstraint(value, name)
 }
 
-// CreateOracleType creates or replaces an Oracle user-defined type (UDT).
-func (m Migrator) CreateType(typeName, definition string) error {
-	if typeName == "" || definition == "" {
+// CreateType creates or replaces an Oracle user-defined type.
+func (m Migrator) CreateType(typeName, typeKind, typeof string) error {
+	if typeName == "" || typeKind == "" || typeof == "" {
 		return fmt.Errorf("CreateOracleType: both typeName and definition are required")
 	}
 
-	sql := fmt.Sprintf(`CREATE OR REPLACE TYPE "%s" AS %s`, strings.ToLower(typeName), definition)
+	sql := fmt.Sprintf(`CREATE OR REPLACE TYPE "%s" AS %s OF %s`, strings.ToLower(typeName), typeKind, typeof)
 	return m.DB.Exec(sql).Error
 }
 
-// DropOracleType drops an Oracle user-defined type safely.
-func (m Migrator) Droptype(typeName string) error {
+// DropType drops an Oracle user-defined type safely.
+func (m Migrator) DropType(typeName string) error {
 	if typeName == "" {
 		return fmt.Errorf("DropOracleType: typeName is required")
 	}
 
-	sql := fmt.Sprintf(`
-BEGIN
-  EXECUTE IMMEDIATE 'DROP TYPE "%s" FORCE';
-EXCEPTION
-  WHEN OTHERS THEN
-    IF SQLCODE != -4043 THEN
-      RAISE;
-    END IF;
-END;`, strings.ToLower(typeName))
+	sql := fmt.Sprintf(`DROP TYPE "%s";`, strings.ToLower(typeName))
 
 	return m.DB.Exec(sql).Error
 }

tests/migrate_test.go

@@ -1985,17 +1985,17 @@ func TestOracleTypeCreateDrop(t *testing.T) {
 		t.Skip("Skipping: current dialect migrator is not Oracle-specific")
 	}
 
-	// 1️⃣ Drop type if it exists
+	// Drop type if it exists
 	t.Run("drop_existing_type_if_any", func(t *testing.T) {
-		err := m.Droptype(typeName)
+		err := m.DropType(typeName)
 		if err != nil && !strings.Contains(err.Error(), "ORA-04043") {
 			t.Fatalf("Unexpected error dropping type: %v", err)
 		}
 	})
 
-	// 2️⃣ Create new VARRAY type
+	// Create new VARRAY type
 	t.Run("create_varray_type", func(t *testing.T) {
-		err := m.CreateType(typeName, "VARRAY(10) OF VARCHAR2(80)")
+		err := m.CreateType(typeName, "VARRAY(10)", "VARCHAR2(60)")
 		if err != nil {
 			t.Fatalf("Failed to create Oracle type: %v", err)
 		}
@@ -2010,7 +2010,7 @@ func TestOracleTypeCreateDrop(t *testing.T) {
 		}
 	})
 
-	// 3️⃣ Create table using the custom type
+	// Create table using the custom type
 	t.Run("create_table_using_custom_type", func(t *testing.T) {
 		createTableSQL := fmt.Sprintf(`
 			CREATE TABLE "%s" (
@@ -2028,13 +2028,13 @@ func TestOracleTypeCreateDrop(t *testing.T) {
 		}
 	})
 
-	// 4️⃣ Drop table and type
+	// Drop table and type
 	t.Run("drop_table_and_type", func(t *testing.T) {
 		if err := m.DropTable(tableName); err != nil {
 			t.Fatalf("Failed to drop table %s: %v", tableName, err)
 		}
 
-		if err := m.Droptype(typeName); err != nil {
+		if err := m.DropType(typeName); err != nil {
 			t.Fatalf("Failed to drop type %s: %v", typeName, err)
 		}