From 3c7285aef8776053a0ec5076cf7e95d17f370f36 Mon Sep 17 00:00:00 2001
From: Remy Pinsonneau <remy.pinsonneau@iki-project.fr.eu.org>
Date: Sat, 6 Aug 2011 20:12:21 +0000
Subject: [PATCH] Fix for postgresql database => reserved keyword "user"

---
 rundeckapp/grails-app/domain/CommandExec.groovy    |    5 +++++
 .../grails-app/domain/ExecutionContext.groovy      |    5 +++++
 .../grails-app/domain/ScheduledExecution.groovy    |    5 +++++
 rundeckapp/grails-app/domain/User.groovy           |    5 +++++
 4 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/rundeckapp/grails-app/domain/CommandExec.groovy b/rundeckapp/grails-app/domain/CommandExec.groovy
index f02223d..910028f 100644
--- a/rundeckapp/grails-app/domain/CommandExec.groovy
+++ b/rundeckapp/grails-app/domain/CommandExec.groovy
@@ -113,4 +113,9 @@ public class CommandExec extends ExecutionContext implements IWorkflowCmdItem {
         }
         return ce
     }
+    
+    static mapping = {
+        user column:'login'
+    }
+    
 }
\ No newline at end of file
diff --git a/rundeckapp/grails-app/domain/ExecutionContext.groovy b/rundeckapp/grails-app/domain/ExecutionContext.groovy
index 10ede4b..c73457a 100644
--- a/rundeckapp/grails-app/domain/ExecutionContext.groovy
+++ b/rundeckapp/grails-app/domain/ExecutionContext.groovy
@@ -16,5 +16,10 @@ abstract class ExecutionContext extends BaseNodeFilters{
     String adhocLocalString
     String adhocFilepath
     Boolean adhocExecution=false
+    
+    static mapping = {
+        user column:'login'
+    }
+    
 }
 
diff --git a/rundeckapp/grails-app/domain/ScheduledExecution.groovy b/rundeckapp/grails-app/domain/ScheduledExecution.groovy
index 0fc0c42..78e7e48 100644
--- a/rundeckapp/grails-app/domain/ScheduledExecution.groovy
+++ b/rundeckapp/grails-app/domain/ScheduledExecution.groovy
@@ -531,5 +531,10 @@ class ScheduledExecution extends ExecutionContext {
     def getExtid(){
         return this.uuid?:this.id.toString()
     }
+    
+    static mapping = {
+        user column:'login'
+    }
+        
 }
 
diff --git a/rundeckapp/grails-app/domain/User.groovy b/rundeckapp/grails-app/domain/User.groovy
index 7423ed5..2a1977f 100644
--- a/rundeckapp/grails-app/domain/User.groovy
+++ b/rundeckapp/grails-app/domain/User.groovy
@@ -18,4 +18,9 @@ class User {
         dashboardPref(nullable:true)
         filterPref(nullable:true)
     }
+    
+    static mapping = {
+        table 'login'
+    }
+    
 }
-- 
1.7.2.5