Skip to content

Commit 239e193

Browse files
committed
Use migrations from metasploit_data_models
[#44034071] metasploit_data_models version 0.5.0 copied the migrations from metasploit-framework/data/sql/migrate to metasploit_data_models/db/migrate so that specs could be written the Mdm models in metasploit_data_models. As part of the specs, :null => false columns that should be :null => true were discovered, so a new migration was added, but to metasploit_data_models/db/migrate, so it could be tested. Instead of replicating migrations back and forth, I'm removing the migrations completely from metasploit-framework and changing the default migration path in Msf::DbManager#migration_paths to MetasploitDataModels.root.join('db', 'migrate').
1 parent 8f58c7b commit 239e193

File tree

88 files changed

+13
-2219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+13
-2219
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'activerecord'
77
# Needed for some admin modules (scrutinizer_add_user.rb)
88
gem 'json'
99
# Database models shared between framework and Pro.
10-
gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.4.0'
10+
gem 'metasploit_data_models', :git => 'git://github.com/rapid7/metasploit_data_models.git', :tag => '0.5.1'
1111
# Needed by msfgui and other rpc components
1212
gem 'msgpack'
1313
# Needed by anemone crawler

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
GIT
22
remote: git://github.com/rapid7/metasploit_data_models.git
3-
revision: 448c1065329efea1eac76a3897f626f122666743
4-
tag: 0.4.0
3+
revision: a56276f8f6d1f2d532c03d2900537cadf94e1411
4+
tag: 0.5.1
55
specs:
6-
metasploit_data_models (0.4.0)
6+
metasploit_data_models (0.5.1)
77
activerecord (>= 3.2.10)
88
activesupport
99
pg
@@ -25,7 +25,7 @@ GEM
2525
multi_json (~> 1.0)
2626
arel (3.0.2)
2727
builder (3.0.4)
28-
coderay (1.0.8)
28+
coderay (1.0.9)
2929
diff-lcs (1.1.3)
3030
i18n (0.6.1)
3131
json (1.7.7)
@@ -35,10 +35,10 @@ GEM
3535
nokogiri (1.5.6)
3636
pcaprub (0.11.3)
3737
pg (0.14.1)
38-
pry (0.9.10)
38+
pry (0.9.12)
3939
coderay (~> 1.0.5)
4040
method_source (~> 0.8)
41-
slop (~> 3.3.1)
41+
slop (~> 3.4)
4242
rake (10.0.2)
4343
redcarpet (2.2.2)
4444
robots (0.10.1)
@@ -54,7 +54,7 @@ GEM
5454
multi_json (~> 1.0.3)
5555
simplecov-html (~> 0.5.3)
5656
simplecov-html (0.5.3)
57-
slop (3.3.3)
57+
slop (3.4.3)
5858
tzinfo (0.3.35)
5959
yard (0.8.3)
6060

data/sql/migrate/000_create_tables.rb

Lines changed: 0 additions & 79 deletions
This file was deleted.

data/sql/migrate/001_add_wmap_tables.rb

Lines changed: 0 additions & 35 deletions
This file was deleted.

data/sql/migrate/002_add_workspaces.rb

Lines changed: 0 additions & 36 deletions
This file was deleted.

data/sql/migrate/003_move_notes.rb

Lines changed: 0 additions & 20 deletions
This file was deleted.

data/sql/migrate/004_add_events_table.rb

Lines changed: 0 additions & 16 deletions
This file was deleted.

data/sql/migrate/005_expand_info.rb

Lines changed: 0 additions & 58 deletions
This file was deleted.

data/sql/migrate/006_add_timestamps.rb

Lines changed: 0 additions & 26 deletions
This file was deleted.

data/sql/migrate/007_add_loots.rb

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)