Commits

shaib committed 61f3422

Fix Oracle and SQL Server backends for alter_column behavior (refs #1053)

Comments (0)

Files changed (2)

south/db/oracle.py

             (self.alter_string_set_default, params.copy()),
         ]
 
-        # UNIQUE constraint
-        unique_constraint = list(self._constraints_affecting_columns(table_name, [name], 'UNIQUE'))
-        if field.unique and not unique_constraint:
-            self.create_unique(table_name, [name])
-        elif not field.unique and unique_constraint:
-            self.delete_unique(table_name, [name])
-
         # drop CHECK constraints. Make sure this is executed before the ALTER TABLE statements
         # generated above, since those statements recreate the constraints we delete here.
         check_constraints = self._constraints_affecting_columns(table_name, [name], "CHECK")

south/db/sql_server/pyodbc.py

         ret_val = super(DatabaseOperations, self).alter_column(table_name, name, field, explicit_name, ignore_constraints=True)
         
         if not ignore_constraints:
-            unique_field_handled = False
             for cname, (ctype,args) in constraints.items():
                 params = dict(table = table,
                               constraint = qn(cname))
                 if ctype=='UNIQUE':
-                    if len(args)==1:
-                        unique_field_handled = True # 
-                    if len(args)>1 or field.unique:
-                        params['columns'] = ", ".join(map(qn,args))
-                        sql = self.create_unique_sql % params
-                    else:
-                        continue
+                    params['columns'] = ", ".join(map(qn,args))
+                    sql = self.create_unique_sql % params
                 elif ctype=='PRIMARY KEY':
                     params['columns'] = ", ".join(map(qn,args))
                     sql = self.create_primary_key_string % params
                 else:
                     raise NotImplementedError("Don't know how to handle constraints of type "+ type)                    
                 self.execute(sql, [])
-            # Create unique constraint if necessary
-            if field.unique and not unique_field_handled:
-                self.create_unique(table_name, (name,))
             # Create foreign key if necessary
             if field.rel and self.supports_foreign_keys:
                 self.execute(
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.