diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-03-15 11:00:57 +0100 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-03-15 11:00:57 +0100 |
| commit | f16ec1f6717175089639d8c4348369bcb8c04b5e (patch) | |
| tree | 8dc8add2560e8a9c04133a52ea87d9354f640849 /sonar-server/src/main/webapp/WEB-INF | |
| parent | 0da9800cf24987bb9118af3b553c3fd34d735d82 (diff) | |
| download | sonarqube-f16ec1f6717175089639d8c4348369bcb8c04b5e.tar.gz sonarqube-f16ec1f6717175089639d8c4348369bcb8c04b5e.zip | |
Do not use deprecated rule categories (column MEASURES.RULES_CATEGORY_ID, table RULES_CATEGORY_ID), but keep them in API for backward-compatibility
Diffstat (limited to 'sonar-server/src/main/webapp/WEB-INF')
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb | 2 | ||||
| -rw-r--r-- | sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb index 09ea92f6d6c..f13ed7a1af0 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/timemachine_controller.rb @@ -73,7 +73,7 @@ class Api::TimemachineController < Api::ApiController @measures_by_sid={} unless @metrics.empty? - sql_conditions = ['snapshots.project_id=:rid AND snapshots.status=:status AND project_measures.rules_category_id IS NULL AND project_measures.rule_id IS NULL AND project_measures.rule_priority IS NULL AND project_measures.person_id IS NULL'] + sql_conditions = ['snapshots.project_id=:rid AND snapshots.status=:status AND project_measures.rule_id IS NULL AND project_measures.rule_priority IS NULL AND project_measures.person_id IS NULL'] sql_values = {:rid => @resource.id, :status => Snapshot::STATUS_PROCESSED} if params[:fromDateTime] diff --git a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb b/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb index c199fecb76f..d57ae80c12b 100644 --- a/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb +++ b/sonar-server/src/main/webapp/WEB-INF/db/migrate/001_initial_schema.rb @@ -72,7 +72,7 @@ class InitialSchema < ActiveRecord::Migration t.column :rule_id, :integer t.column :rules_category_id, :integer t.column :text_value, :string, :limit => 96, :null => true - t.column 'tendency', :integer, :null => true + t.column :tendency, :integer, :null => true t.column :measure_date, :datetime, :null => true t.column :project_id, :integer, :null => true t.column :alert_status, :string, :limit => 5, :null => true |