From 6d19b04f606cc0ea33afc06efb05f6617e751091 Mon Sep 17 00:00:00 2001 From: antisnatchor Date: Mon, 27 Jun 2011 14:26:44 +0000 Subject: [PATCH] Using _ instead of . for DB table names: this convention ([a-z0-9_]) follow best-practices, and in this way there is no need to use a backtick when writing sql queries in MySQL (or in the future PostreSQL) git-svn-id: https://beef.googlecode.com/svn/trunk@1033 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9 --- core/main/distributed_engine/models/rules.rb | 2 +- core/main/models/commandmodule.rb | 2 +- core/main/models/dynamiccommandinfo.rb | 2 +- core/main/models/dynamicpayloadinfo.rb | 2 +- core/main/models/dynamicpayloads.rb | 2 +- core/main/models/hookedbrowser.rb | 2 +- core/main/models/log.rb | 2 +- core/main/models/optioncache.rb | 2 +- core/main/models/result.rb | 2 +- core/main/models/user.rb | 2 +- extensions/initialization/models/browserdetails.rb | 2 +- extensions/requester/models/http.rb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/main/distributed_engine/models/rules.rb b/core/main/distributed_engine/models/rules.rb index 307b02ad9..eb7a792f9 100644 --- a/core/main/distributed_engine/models/rules.rb +++ b/core/main/distributed_engine/models/rules.rb @@ -9,7 +9,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'extensions.distributed_engine.rules' + storage_names[:default] = 'extension_distributedengine_rules' property :id, Serial property :data, Text diff --git a/core/main/models/commandmodule.rb b/core/main/models/commandmodule.rb index d0ff498e5..6c1f6d3cd 100644 --- a/core/main/models/commandmodule.rb +++ b/core/main/models/commandmodule.rb @@ -6,7 +6,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.command_modules' + storage_names[:default] = 'core_commandmodules' property :id, Serial property :name, Text, :lazy => false diff --git a/core/main/models/dynamiccommandinfo.rb b/core/main/models/dynamiccommandinfo.rb index 04d16ad48..042bdcc71 100644 --- a/core/main/models/dynamiccommandinfo.rb +++ b/core/main/models/dynamiccommandinfo.rb @@ -6,7 +6,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.dynamic_command_info' + storage_names[:default] = 'core_dynamiccommandinfo' property :id, Serial property :name, Text, :lazy => false diff --git a/core/main/models/dynamicpayloadinfo.rb b/core/main/models/dynamicpayloadinfo.rb index e24bf33f3..6c5f75cd1 100644 --- a/core/main/models/dynamicpayloadinfo.rb +++ b/core/main/models/dynamicpayloadinfo.rb @@ -6,7 +6,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.dynamic_payload_info' + storage_names[:default] = 'core_dynamicpayloadinfo' property :id, Serial property :name, String, :length => 30 diff --git a/core/main/models/dynamicpayloads.rb b/core/main/models/dynamicpayloads.rb index 98b030147..8678258f4 100644 --- a/core/main/models/dynamicpayloads.rb +++ b/core/main/models/dynamicpayloads.rb @@ -6,7 +6,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.dynamic_payloads' + storage_names[:default] = 'core_dynamicpayloads' property :id, Serial property :name, Text, :lazy => false diff --git a/core/main/models/hookedbrowser.rb b/core/main/models/hookedbrowser.rb index c18113c65..2dda1e811 100644 --- a/core/main/models/hookedbrowser.rb +++ b/core/main/models/hookedbrowser.rb @@ -8,7 +8,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.hooked_browsers' + storage_names[:default] = 'core_hookedbrowsers' property :id, Serial property :session, Text, :lazy => false diff --git a/core/main/models/log.rb b/core/main/models/log.rb index c106c5936..f34611186 100644 --- a/core/main/models/log.rb +++ b/core/main/models/log.rb @@ -10,7 +10,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.logs' + storage_names[:default] = 'core_logs' property :id, Serial property :type, Text, :lazy => false diff --git a/core/main/models/optioncache.rb b/core/main/models/optioncache.rb index 90d6c6ffc..47292ca30 100644 --- a/core/main/models/optioncache.rb +++ b/core/main/models/optioncache.rb @@ -6,7 +6,7 @@ class OptionCache include DataMapper::Resource - storage_names[:default] = 'core.option_cache' + storage_names[:default] = 'core_optioncache' property :id, Serial property :name, Text diff --git a/core/main/models/result.rb b/core/main/models/result.rb index f6dfc6dc5..4baf7958b 100644 --- a/core/main/models/result.rb +++ b/core/main/models/result.rb @@ -8,7 +8,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'core.results' + storage_names[:default] = 'core_results' property :id, Serial property :date, String, :length => 15, :lazy => false diff --git a/core/main/models/user.rb b/core/main/models/user.rb index e8b971053..a4268670e 100644 --- a/core/main/models/user.rb +++ b/core/main/models/user.rb @@ -10,7 +10,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'extension.admin_ui.users' + storage_names[:default] = 'extension_adminui_users' property :id, Serial property :session_id, String, :length => 255 diff --git a/extensions/initialization/models/browserdetails.rb b/extensions/initialization/models/browserdetails.rb index ef04b3da4..30b8d09d3 100644 --- a/extensions/initialization/models/browserdetails.rb +++ b/extensions/initialization/models/browserdetails.rb @@ -11,7 +11,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'extension.initialization.browser_details' + storage_names[:default] = 'extension_initialization_browserdetails' attr_reader :guard diff --git a/extensions/requester/models/http.rb b/extensions/requester/models/http.rb index 3c76773a5..da5a174dc 100644 --- a/extensions/requester/models/http.rb +++ b/extensions/requester/models/http.rb @@ -8,7 +8,7 @@ module Models include DataMapper::Resource - storage_names[:default] = 'extension.requester.http' + storage_names[:default] = 'extension_requester_http' property :id, Serial