src/wuttaweb/code-templates/new-table.mako

@@ -15,6 +15,16 @@ class ${model_name}(model.Base):
     ${description}
     """
     __tablename__ = "${table_name}"
+    % if any([c["data_type"]["type"] == "_fk_uuid_" for c in columns]):
+    __table_args__ = (
+        % for column in columns:
+        % if column["data_type"]["type"] == "_fk_uuid_":
+        sa.ForeignKeyConstraint(["${column['name']}"], ["${column['data_type']['reference']}.uuid"],
+                                name="${table_name}_fk_${column['data_type']['reference']}"),
+        % endif
+        % endfor
+    )
+    % endif
     % if versioned:
     % if all([c["versioned"] for c in columns]):
     __versioned__ = {}
@@ -38,23 +48,17 @@ class ${model_name}(model.Base):
 
     % if column["name"] == "uuid":
     uuid = model.uuid_column()
-    % elif column["data_type"]["type"] == "_fk_uuid_":
+    % else:
-    ${column["name"]} = model.uuid_fk_column("${column['data_type']['reference']}.uuid",
+    ${column["name"]} = sa.Column(${column["formatted_data_type"]}, nullable=${column["nullable"]}, doc="""
-                                nullable=${column["nullable"]})
+    ${column["description"] or ""}
-    % if column["relationship"]:
+    """)
+    % if column["data_type"]["type"] == "_fk_uuid_" and column["relationship"]:
     ${column["relationship"]["name"]} = orm.relationship(
         "${column['relationship']['reference_model']}",
         doc="""
         ${column["description"] or ""}
         """)
     % endif
-    % else:
-    ${column["name"]} = sa.Column(
-        ${column["formatted_data_type"]},
-        nullable=${column["nullable"]},
-        doc="""
-        ${column["description"] or ""}
-        """)
     % endif
     % endfor
 

src/wuttaweb/templates/master/view.mako

@@ -21,8 +21,7 @@
 
   % if master.has_rows:
       <div style="display: flex; flex-direction: column;">
-        <div class="block"
+        <div style="display: flex; justify-content: space-between;">
-             style="display: flex; justify-content: space-between;">
 
           ## main form
           <div style="flex-grow: 1;">
@@ -35,6 +34,7 @@
         </div>
 
         ## rows grid
+        <br />
         <h4 class="block is-size-4">${master.get_rows_title() or ''}</h4>
         ${rows_grid.render_vue_tag()}
       </div>

src/wuttaweb/templates/tables/app/create.mako

@@ -818,7 +818,7 @@
         } else if (dataType.type == 'UUID') {
             return `UUID()`
         } else if (dataType.type == '_fk_uuid_') {
-            return `UUID()`
+            return 'sa.String(length=32)'
         } else if (dataType.type == '_other_') {
             return dataType.literal
         } else {
@@ -947,7 +947,7 @@
                 } else {
                     this.modelImportProblem = false
                     this.modelImported = this.modelImportName
-                    this.revisionMessage = `add ${"$"}{this.tableModelTitlePlural}`
+                    this.revisionMessage = `add table for ${"$"}{this.tableModelTitlePlural}`
                 }
             }, 200)
         })