summaryrefslogtreecommitdiff
path: root/db/migrate
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 08:45:30 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 08:45:30 +0100
commite2a03b5d20253d7a1eb10b8c110d9feec79e995f (patch)
treecc36cbb2572e549ce59388654d358cb1e2771ecd /db/migrate
parent595a48a91f8549b20109942e0b80df4f891d5999 (diff)
parent21d0843117c0962bd962fc50fccaf276a5b3067f (diff)
Fixed a merging conflict.
Merge branch 'switchboard' into develop Conflicts: app/models/sip_account.rb
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20130307104654_create_switchboards.rb13
-rw-r--r--db/migrate/20130307122344_create_switchboard_entries.rb15
2 files changed, 28 insertions, 0 deletions
diff --git a/db/migrate/20130307104654_create_switchboards.rb b/db/migrate/20130307104654_create_switchboards.rb
new file mode 100644
index 0000000..222b168
--- /dev/null
+++ b/db/migrate/20130307104654_create_switchboards.rb
@@ -0,0 +1,13 @@
+class CreateSwitchboards < ActiveRecord::Migration
+ def self.up
+ create_table :switchboards do |t|
+ t.string :name
+ t.integer :user_id
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :switchboards
+ end
+end
diff --git a/db/migrate/20130307122344_create_switchboard_entries.rb b/db/migrate/20130307122344_create_switchboard_entries.rb
new file mode 100644
index 0000000..1c7521e
--- /dev/null
+++ b/db/migrate/20130307122344_create_switchboard_entries.rb
@@ -0,0 +1,15 @@
+class CreateSwitchboardEntries < ActiveRecord::Migration
+ def self.up
+ create_table :switchboard_entries do |t|
+ t.integer :switchboard_id
+ t.integer :sip_account_id
+ t.string :name
+ t.integer :position
+ t.timestamps
+ end
+ end
+
+ def self.down
+ drop_table :switchboard_entries
+ end
+end