From 0d30667ab5b7de36a773ace88e7315de8c92cbda Mon Sep 17 00:00:00 2001
From: Louis Schmieder <dev@louis-schmieder.de>
Date: Mon, 16 Aug 2021 13:59:23 +0200
Subject: [PATCH] orm: fix orm unique lists (#11198)

---
 examples/database/orm.v | 3 ---
 vlib/orm/orm.v          | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/examples/database/orm.v b/examples/database/orm.v
index a7db00c160..b308e914d9 100644
--- a/examples/database/orm.v
+++ b/examples/database/orm.v
@@ -67,7 +67,6 @@ fn sqlite3_array() {
 	}
 
 	sql db {
-		drop table Child
 		drop table Parent
 	}
 
@@ -111,7 +110,6 @@ fn mysql_array() {
 	eprintln(parent)
 
 	sql db {
-		drop table Child
 		drop table Parent
 	}
 
@@ -150,7 +148,6 @@ fn psql_array() {
 	eprintln(parent)
 
 	sql db {
-		drop table Child
 		drop table Parent
 	}
 
diff --git a/vlib/orm/orm.v b/vlib/orm/orm.v
index a6831d1846..960e1764f7 100644
--- a/vlib/orm/orm.v
+++ b/vlib/orm/orm.v
@@ -298,6 +298,7 @@ pub fn orm_table_gen(table string, para string, defaults bool, def_unique_len in
 		mut is_skip := false
 		mut unique_len := 0
 		// mut fkey := ''
+		mut field_name := sql_field_name(field)
 		for attr in field.attrs {
 			match attr.name {
 				'primary' {
@@ -306,7 +307,7 @@ pub fn orm_table_gen(table string, para string, defaults bool, def_unique_len in
 				'unique' {
 					if attr.arg != '' {
 						if attr.kind == .string {
-							unique[attr.arg] << field.name
+							unique[attr.arg] << field_name
 							continue
 						} else if attr.kind == .number {
 							unique_len = attr.arg.int()
@@ -337,7 +338,6 @@ pub fn orm_table_gen(table string, para string, defaults bool, def_unique_len in
 			continue
 		}
 		mut stmt := ''
-		mut field_name := sql_field_name(field)
 		mut ctyp := sql_from_v(sql_field_type(field)) or {
 			field_name = '${field_name}_id'
 			sql_from_v(7) ?
@@ -353,7 +353,7 @@ pub fn orm_table_gen(table string, para string, defaults bool, def_unique_len in
 			stmt += ' NOT NULL'
 		}
 		if is_unique {
-			mut f := 'UNIQUE($para$field.name$para'
+			mut f := 'UNIQUE($para$field_name$para'
 			if ctyp == 'TEXT' && def_unique_len > 0 {
 				if unique_len > 0 {
 					f += '($unique_len)'