summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-26 10:48:26 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-26 10:48:26 +0100
commitb144a7885610d605447c80f659643524a839db0c (patch)
tree0ba02970c4ce7a30d2859b01d9121fbf04cd5c75 /db
parent0442cd19bc9383669b506185356227361a16e442 (diff)
parentffaa80e8d46b3b6b7597af6f157724005f48bae4 (diff)
Merge branch 'restore' into develop
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20130225160423_create_restore_jobs.rb13
-rw-r--r--db/schema.rb33
2 files changed, 45 insertions, 1 deletions
diff --git a/db/migrate/20130225160423_create_restore_jobs.rb b/db/migrate/20130225160423_create_restore_jobs.rb
new file mode 100644
index 0000000..9f83791
--- /dev/null
+++ b/db/migrate/20130225160423_create_restore_jobs.rb
@@ -0,0 +1,13 @@
+class CreateRestoreJobs < ActiveRecord::Migration
+ def self.up
+ create_table :restore_jobs do |t|
+ t.string :state
+ t.string :backup_file
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :restore_jobs
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index df55604..60bc7f5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130215133749) do
+ActiveRecord::Schema.define(:version => 20130225160423) do
create_table "access_authorizations", :force => true do |t|
t.string "access_authorizationable_type"
@@ -554,6 +554,30 @@ ActiveRecord::Schema.define(:version => 20130215133749) do
t.string "trunk_access_code"
end
+ create_table "group_memberships", :force => true do |t|
+ t.integer "group_id"
+ t.string "item_type"
+ t.integer "item_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ create_table "group_permissions", :force => true do |t|
+ t.integer "group_id"
+ t.string "permission"
+ t.integer "target_group_id"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ create_table "groups", :force => true do |t|
+ t.string "name"
+ t.boolean "active"
+ t.string "comment"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "gs_cluster_sync_log_entries", :force => true do |t|
t.integer "gs_node_id"
t.string "class_name"
@@ -854,6 +878,13 @@ ActiveRecord::Schema.define(:version => 20130215133749) do
add_index "registrations", ["reg_user", "realm", "hostname"], :name => "regindex1"
+ create_table "restore_jobs", :force => true do |t|
+ t.string "state"
+ t.string "backup_file"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
create_table "ringtones", :force => true do |t|
t.string "ringtoneable_type"
t.integer "ringtoneable_id"