Ticket #2040: _get_sql_field_def.diff

P:/org/django/django/core/management.py

@@ -128 +128 @@
 get_sql_create.help_doc = "Prints the CREATE TABLE SQL statements for the given app name(s)."
 get_sql_create.args = APP_ARGS
 
+#------------------------------------------------------------------------------
+
+def _get_sql_field_def(klass, f, models_already_seen=set() ):
+    """
+    Get the SQL for a field definition
+    """
+    
+    # copied from _get_sql_model_create
+    # not neede lines are outcommented (will be removed after review)
+
+    from django.db import backend, get_creation_module, models
+    data_types = get_creation_module().DATA_TYPES
+
+    #opts = klass._meta
+    #final_output = []
+    #table_output = []
+    #pending_references = {}
+
+    if isinstance(f, models.ForeignKey):
+        rel_field = f.rel.get_related_field()
+        data_type = get_rel_data_type(rel_field)
+    else:
+        rel_field = f
+        data_type = f.get_internal_type()
+    col_type = data_types[data_type]
+    if col_type is not None:
+        # Make the definition (e.g. 'foo VARCHAR(30)') for this field.
+        field_output = [style.SQL_FIELD(backend.quote_name(f.column)),
+            style.SQL_COLTYPE(col_type % rel_field.__dict__)]
+        field_output.append(style.SQL_KEYWORD('%sNULL' % (not f.null and 'NOT ' or '')))
+        if f.unique:
+            field_output.append(style.SQL_KEYWORD('UNIQUE'))
+        if f.primary_key:
+            field_output.append(style.SQL_KEYWORD('PRIMARY KEY'))
+        if f.rel:
+            if f.rel.to in models_already_seen:
+                field_output.append(style.SQL_KEYWORD('REFERENCES') + ' ' + \
+                    style.SQL_TABLE(backend.quote_name(f.rel.to._meta.db_table)) + ' (' + \
+                    style.SQL_FIELD(backend.quote_name(f.rel.to._meta.get_field(f.rel.field_name).column)) + ')'
+                )
+            #else:
+                # We haven't yet created the table to which this field
+                # is related, so save it for later.
+                #pr = pending_references.setdefault(f.rel.to, []).append((klass, f))
+        #table_output.append(' '.join(field_output))
+        
+        # code added during refactoring
+        has_pending_ref = False
+        if f.rel:
+            if f.rel.to not in models_already_seen:
+                has_pending_ref = True
+                    
+        
+    return field_output, has_pending_ref
+
+#------------------------------------------------------------------------------
+
 def _get_sql_model_create(klass, models_already_seen=set()):
     """
     Get the SQL required to create a single model.