Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

2 files changed, 33 insertions, 0 deletions

diff --git a/db/migrate/20120515134710_create_imports.rb b/db/migrate/20120515134710_create_imports.rb
new file mode 100644
index 000000000..5da398fc9
--- /dev/null
+++ b/db/migrate/20120515134710_create_imports.rb
@@ -0,0 +1,11 @@
+class CreateImports < ActiveRecord::Migration
+  def change
+    create_table :imports do |t|
+      t.belongs_to :referential
+      t.string :status
+
+      t.timestamps
+    end
+    add_index :imports, :referential_id
+  end
+end
diff --git a/db/migrate/20120516172252_create_delayed_jobs.rb b/db/migrate/20120516172252_create_delayed_jobs.rb
new file mode 100644
index 000000000..e7841608c
--- /dev/null
+++ b/db/migrate/20120516172252_create_delayed_jobs.rb
@@ -0,0 +1,22 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+      table.text     :handler                      # YAML-encoded string of the object that will do work
+      table.text     :last_error                   # reason for last failure (See Note below)
+      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                    # Set when a client is working on this object
+      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                    # Who is working on this object (if locked)
+      table.string   :queue                        # The name of the queue this job is in
+      table.timestamps
+    end
+
+    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end