diff --git a/tracks/db/migrate/002_add_user_id.rb b/tracks/db/migrate/002_add_user_id.rb index 0cbe9226..0f7e0f10 100644 --- a/tracks/db/migrate/002_add_user_id.rb +++ b/tracks/db/migrate/002_add_user_id.rb @@ -1,4 +1,9 @@ class AddUserId < ActiveRecord::Migration + + class Project < ActiveRecord::Base; end + class Context < ActiveRecord::Base; end + class Todo < ActiveRecord::Base; end + def self.up add_column :contexts, :user_id, :integer, :default => 1 add_column :projects, :user_id, :integer, :default => 1 diff --git a/tracks/db/migrate/006_add_preferences_to_user_table.rb b/tracks/db/migrate/006_add_preferences_to_user_table.rb index e8f507de..cf38c227 100644 --- a/tracks/db/migrate/006_add_preferences_to_user_table.rb +++ b/tracks/db/migrate/006_add_preferences_to_user_table.rb @@ -1,4 +1,7 @@ class AddPreferencesToUserTable < ActiveRecord::Migration + + class USer < ActiveRecord::Base; end + def self.up add_column :users, :preferences, :text @users = User.find(:all) diff --git a/tracks/db/migrate/008_add_subclass_attr_to_todos.rb b/tracks/db/migrate/008_add_subclass_attr_to_todos.rb index ce6803eb..00a8e0a1 100644 --- a/tracks/db/migrate/008_add_subclass_attr_to_todos.rb +++ b/tracks/db/migrate/008_add_subclass_attr_to_todos.rb @@ -1,4 +1,7 @@ class AddSubclassAttrToTodos < ActiveRecord::Migration + + class Todo < ActiveRecord::Base; end + def self.up add_column :todos, :type, :string, :null => false, :default => "Immediate" add_column :todos, :show_from, :date diff --git a/tracks/db/schema.rb b/tracks/db/schema.rb index 3bcd23ef..331a36f8 100644 --- a/tracks/db/schema.rb +++ b/tracks/db/schema.rb @@ -5,10 +5,10 @@ ActiveRecord::Schema.define(:version => 30) do create_table "contexts", :force => true do |t| - t.column "name", :string, :default => "", :null => false - t.column "hide", :integer, :limit => 4, :default => 0, :null => false - t.column "position", :integer, :default => 0, :null => false - t.column "user_id", :integer, :default => 0, :null => false + t.column "name", :string, :default => "", :null => false + t.column "position", :integer, :null => false + t.column "hide", :boolean, :default => false + t.column "user_id", :integer, :default => 1 t.column "created_at", :datetime t.column "updated_at", :datetime end @@ -17,8 +17,8 @@ ActiveRecord::Schema.define(:version => 30) do add_index "contexts", ["user_id", "name"], :name => "index_contexts_on_user_id_and_name" create_table "notes", :force => true do |t| - t.column "user_id", :integer, :default => 0, :null => false - t.column "project_id", :integer, :default => 0, :null => false + t.column "user_id", :integer, :null => false + t.column "project_id", :integer, :null => false t.column "body", :text t.column "created_at", :datetime t.column "updated_at", :datetime @@ -44,7 +44,7 @@ ActiveRecord::Schema.define(:version => 30) do end create_table "preferences", :force => true do |t| - t.column "user_id", :integer, :default => 0, :null => false + t.column "user_id", :integer, :null => false t.column "date_format", :string, :limit => 40, :default => "%d/%m/%Y", :null => false t.column "week_starts", :integer, :default => 0, :null => false t.column "show_number_completed", :integer, :default => 5, :null => false @@ -65,8 +65,8 @@ ActiveRecord::Schema.define(:version => 30) do create_table "projects", :force => true do |t| t.column "name", :string, :default => "", :null => false - t.column "position", :integer, :default => 0, :null => false - t.column "user_id", :integer, :default => 0, :null => false + t.column "position", :integer, :null => false + t.column "user_id", :integer, :default => 1 t.column "description", :text t.column "state", :string, :limit => 20, :default => "active", :null => false t.column "created_at", :datetime @@ -82,7 +82,7 @@ ActiveRecord::Schema.define(:version => 30) do t.column "updated_at", :datetime end - add_index "sessions", ["session_id"], :name => "sessions_session_id_index" + add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id" create_table "taggings", :force => true do |t| t.column "taggable_id", :integer @@ -102,16 +102,16 @@ ActiveRecord::Schema.define(:version => 30) do add_index "tags", ["name"], :name => "index_tags_on_name" create_table "todos", :force => true do |t| - t.column "context_id", :integer, :default => 0, :null => false - t.column "description", :string, :limit => 100, :default => "", :null => false + t.column "context_id", :integer, :null => false + t.column "project_id", :integer + t.column "description", :string, :default => "", :null => false t.column "notes", :text t.column "created_at", :datetime t.column "due", :date t.column "completed_at", :datetime - t.column "project_id", :integer - t.column "user_id", :integer, :default => 0, :null => false + t.column "user_id", :integer, :default => 1 t.column "show_from", :date - t.column "state", :string, :limit => 20, :default => "immediate", :null => false + t.column "state", :string, :limit => 20, :default => "immediate", :null => false end add_index "todos", ["user_id", "state"], :name => "index_todos_on_user_id_and_state" @@ -121,10 +121,10 @@ ActiveRecord::Schema.define(:version => 30) do add_index "todos", ["user_id", "context_id"], :name => "index_todos_on_user_id_and_context_id" create_table "users", :force => true do |t| - t.column "login", :string, :limit => 80 - t.column "password", :string, :limit => 40 + t.column "login", :string, :limit => 80, :default => "", :null => false + t.column "password", :string, :limit => 40, :default => "", :null => false t.column "word", :string - t.column "is_admin", :integer, :limit => 4, :default => 0, :null => false + t.column "is_admin", :boolean, :default => false, :null => false t.column "first_name", :string t.column "last_name", :string t.column "auth_type", :string, :default => "database", :null => false