aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorDavid Gageot <david@gageot.net>2012-07-06 11:06:34 +0200
committerDavid Gageot <david@gageot.net>2012-07-06 11:06:39 +0200
commit2fcbce9f0798dc2dd7071ed2cff981b764b13910 (patch)
tree17df9a26e5cf767a9b636fd4c70d56a7a727ca2c /sonar-server
parent3604bad5910fe85ed9aac7655816b73090075d50 (diff)
downloadsonarqube-2fcbce9f0798dc2dd7071ed2cff981b764b13910.tar.gz
sonarqube-2fcbce9f0798dc2dd7071ed2cff981b764b13910.zip
Nasty Hack to make active record ignore two columns in user system table
We need to find a better solution.
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/vendor/gems/activerecord-jdbc-adapter-1.1.3/lib/arjdbc/jdbc/adapter.rb2
1 files changed, 2 insertions, 0 deletions
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