User groups branch merged.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2869 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 30 insertions, 0 deletions

diff --git a/db/migrate/20090704172350_populate_users_type.rb b/db/migrate/20090704172350_populate_users_type.rb
new file mode 100644
index 000000000..1c31feced
--- /dev/null
+++ b/db/migrate/20090704172350_populate_users_type.rb
@@ -0,0 +1,8 @@
+class PopulateUsersType < ActiveRecord::Migration
+  def self.up
+    Principal.update_all("type = 'User'", "type IS NULL")
+  end
+
+  def self.down
+  end
+end
diff --git a/db/migrate/20090704172355_create_groups_users.rb b/db/migrate/20090704172355_create_groups_users.rb
new file mode 100644
index 000000000..9ce03b95b
--- /dev/null
+++ b/db/migrate/20090704172355_create_groups_users.rb
@@ -0,0 +1,13 @@
+class CreateGroupsUsers < ActiveRecord::Migration
+  def self.up
+    create_table :groups_users, :id => false do |t|
+      t.column :group_id, :integer, :null => false
+      t.column :user_id, :integer, :null => false
+    end
+    add_index :groups_users, [:group_id, :user_id], :unique => true, :name => :groups_users_ids
+  end
+
+  def self.down
+    drop_table :groups_users
+  end
+end
diff --git a/db/migrate/20090704172358_add_member_roles_inherited_from.rb b/db/migrate/20090704172358_add_member_roles_inherited_from.rb
new file mode 100644
index 000000000..4ffa52389
--- /dev/null
+++ b/db/migrate/20090704172358_add_member_roles_inherited_from.rb
@@ -0,0 +1,9 @@
+class AddMemberRolesInheritedFrom < ActiveRecord::Migration
+  def self.up
+    add_column :member_roles, :inherited_from, :integer
+  end
+
+  def self.down
+    remove_column :member_roles, :inherited_from
+  end
+end