Merge branch 'develop' of github.com:amooma/GS5 into develop

2 files changed, 27 insertions, 1 deletions

diff --git a/db/migrate/20130206144829_add_backup_file_to_backup_job.rb b/db/migrate/20130206144829_add_backup_file_to_backup_job.rb
new file mode 100644
index 0000000..e02f2b3
--- /dev/null
+++ b/db/migrate/20130206144829_add_backup_file_to_backup_job.rb
@@ -0,0 +1,5 @@
+class AddBackupFileToBackupJob < ActiveRecord::Migration
+  def change
+    add_column :backup_jobs, :backup_file, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5d4b5e3..5e51305 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 => 20130202140927) do
+ActiveRecord::Schema.define(:version => 20130206144829) do
 
   create_table "access_authorizations", :force => true do |t|
     t.string   "access_authorizationable_type"
@@ -124,6 +124,26 @@ ActiveRecord::Schema.define(:version => 20130202140927) do
     t.string   "music"
   end
 
+  create_table "backup_jobs", :force => true do |t|
+    t.datetime "started_at"
+    t.datetime "finished_at"
+    t.string   "state"
+    t.string   "directory"
+    t.integer  "size_of_the_backup"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+    t.string   "backup_file"
+  end
+
+  create_table "backups", :force => true do |t|
+    t.datetime "start_at"
+    t.datetime "end_at"
+    t.string   "directory"
+    t.string   "size"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "call_forward_cases", :force => true do |t|
     t.string   "value"
     t.datetime "created_at", :null => false
@@ -358,6 +378,7 @@ ActiveRecord::Schema.define(:version => 20130202140927) do
     t.string   "locked_by"
     t.datetime "created_at",                :null => false
     t.datetime "updated_at",                :null => false
+    t.string   "queue"
   end
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"