From: David Gageot <david@gageot.net>
Date: Fri, 6 Jul 2012 09:06:34 +0000 (+0200)
Subject: Nasty Hack to make active record ignore two columns in user system table
X-Git-Tag: 3.2~213
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2fcbce9f0798dc2dd7071ed2cff981b764b13910;p=sonarqube.git

Nasty Hack to make active record ignore two columns in user system table

We need to find a better solution.
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/vendor/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb b/sonar-server/src/main/webapp/WEB-INF/vendor/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb
index f1e68f4d551..ac44408fef4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/vendor/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/vendor/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb
@@ -224,6 +224,8 @@ module ActiveRecord
       end
 
       def jdbc_columns(table_name, name = nil)
+        # sonar
+        return @connection.columns(table_name.to_s).reject { |c| (c.name=='admin' || c.name=='remarks') } if table_name=='users'
         @connection.columns(table_name.to_s)
       end
       alias_chained_method :columns, :query_cache, :jdbc_columns