From 2ec9f15198770c7327729fb2662ba9601b2d4e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Jerman?= <tomaz.jerman@kendu.si>
Date: Mon, 16 Sep 2019 11:31:39 +0200
Subject: [PATCH] Prevent system field ambiguity

---
 compose/repository/record.go      | 6 +++---
 compose/repository/record_test.go | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compose/repository/record.go b/compose/repository/record.go
index b817443d6..400f63575 100644
--- a/compose/repository/record.go
+++ b/compose/repository/record.go
@@ -355,7 +355,7 @@ func isRealRecordCol(name string) (string, bool) {
 	case
 		"recordID",
 		"id":
-		return "id", true
+		return "r.id", true
 	case
 		"module_id",
 		"owned_by",
@@ -365,7 +365,7 @@ func isRealRecordCol(name string) (string, bool) {
 		"updated_at",
 		"deleted_by",
 		"deleted_at":
-		return name, true
+		return "r." + name, true
 
 	case
 		"moduleID",
@@ -376,7 +376,7 @@ func isRealRecordCol(name string) (string, bool) {
 		"updatedAt",
 		"deletedBy",
 		"deletedAt":
-		return name[0:len(name)-2] + "_" + strings.ToLower(name[len(name)-2:]), true
+		return "r." + name[0:len(name)-2] + "_" + strings.ToLower(name[len(name)-2:]), true
 	}
 
 	return name, false
diff --git a/compose/repository/record_test.go b/compose/repository/record_test.go
index 51dd9e283..1e4975a27 100644
--- a/compose/repository/record_test.go
+++ b/compose/repository/record_test.go
@@ -32,14 +32,14 @@ func TestRecordFinder(t *testing.T) {
 		{
 			f: types.RecordFilter{Filter: "id = 5 AND foo = 7"},
 			match: []string{
-				"id = 5",
+				"r.id = 5",
 				"rv_foo.value = 7"},
 			args: []interface{}{"foo"},
 		},
 		{
 			f: types.RecordFilter{Sort: "id ASC, bar DESC"},
 			match: []string{
-				" id ASC",
+				" r.id ASC",
 				" rv_bar.value DESC",
 			},
 			args: []interface{}{"bar"},