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

2 files changed, 27 insertions, 1 deletions

diff --git a/db/migrate/20120529154848_create_import_log_messages.rb b/db/migrate/20120529154848_create_import_log_messages.rb
new file mode 100644
index 000000000..b39a9eda7
--- /dev/null
+++ b/db/migrate/20120529154848_create_import_log_messages.rb
@@ -0,0 +1,14 @@
+class CreateImportLogMessages < ActiveRecord::Migration
+  def change
+    create_table :import_log_messages do |t|
+      t.belongs_to :import
+      t.string :key
+      t.string :arguments
+      t.integer :position
+      t.string :severity
+
+      t.timestamps
+    end
+    add_index :import_log_messages, :import_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 86aebcd98..ed4c93693 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120516172252) do
+ActiveRecord::Schema.define(:version => 20120529154848) do
 
   create_table "company", :force => true do |t|
     t.string   "objectid"
@@ -70,6 +70,18 @@ ActiveRecord::Schema.define(:version => 20120516172252) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "import_log_messages", :force => true do |t|
+    t.integer  "import_id"
+    t.string   "key"
+    t.string   "arguments"
+    t.integer  "position"
+    t.string   "severity"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "import_log_messages", ["import_id"], :name => "index_import_log_messages_on_import_id"
+
   create_table "imports", :force => true do |t|
     t.integer  "referential_id"
     t.string   "status"