From d4ecaa547963dc5dbe5561e8e09e835e6bb871ac Mon Sep 17 00:00:00 2001
From: Christoph Ritler <christoph.ritler@garaio.com>
Date: Fri, 15 Jun 2012 13:51:51 +0200
Subject: [PATCH] define VERSION constant in gem-specific namespace

Before the VERSION constant was defined in an AR namespace,
which confused some of rails autoloading code. we should define
the Version in a namespace, which the gem owns to prevent such conflicts.
---
 activerecord-sqlserver-adapter.gemspec                |  4 ++--
 .../connection_adapters/sqlserver/version.rb          | 11 -----------
 .../connection_adapters/sqlserver_adapter.rb          |  6 ++----
 lib/activerecord-sqlserver-adapter/version.rb         |  3 +++
 4 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 lib/active_record/connection_adapters/sqlserver/version.rb
 create mode 100644 lib/activerecord-sqlserver-adapter/version.rb

diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec
index 31695fbf8..4a1d29742 100644
--- a/activerecord-sqlserver-adapter.gemspec
+++ b/activerecord-sqlserver-adapter.gemspec
@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "active_record/connection_adapters/sqlserver/version"
+require "activerecord-sqlserver-adapter/version"
 
 Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.name          = "activerecord-sqlserver-adapter"
-  s.version       = ActiveRecord::ConnectionAdapters::Sqlserver::Version::VERSION
+  s.version       = ActiverecordSqlserverAdapter::VERSION
   s.summary       = "SQL Server 2005 and 2008 Adapter For ActiveRecord."
   s.description   = "SQL Server 2005 and 2008 Adapter For ActiveRecord"
   
diff --git a/lib/active_record/connection_adapters/sqlserver/version.rb b/lib/active_record/connection_adapters/sqlserver/version.rb
deleted file mode 100644
index eec1cfc2f..000000000
--- a/lib/active_record/connection_adapters/sqlserver/version.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module Sqlserver
-      module Version
-        
-        VERSION = '3.2.4'
-        
-      end
-    end
-  end
-end
diff --git a/lib/active_record/connection_adapters/sqlserver_adapter.rb b/lib/active_record/connection_adapters/sqlserver_adapter.rb
index e2c8a9a6d..e9812eaf9 100644
--- a/lib/active_record/connection_adapters/sqlserver_adapter.rb
+++ b/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -16,7 +16,6 @@
 require 'active_record/connection_adapters/sqlserver/showplan'
 require 'active_record/connection_adapters/sqlserver/quoting'
 require 'active_record/connection_adapters/sqlserver/utils'
-require 'active_record/connection_adapters/sqlserver/version'
 
 module ActiveRecord
   
@@ -177,8 +176,7 @@ class SQLServerAdapter < AbstractAdapter
       include Sqlserver::SchemaStatements
       include Sqlserver::DatabaseLimits
       include Sqlserver::Errors
-      include Sqlserver::Version
-      
+
       ADAPTER_NAME                = 'SQLServer'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011,2012]
@@ -340,7 +338,7 @@ def sqlserver_azure?
       end
       
       def version
-        self.class::VERSION
+        ActiverecordSqlserverAdapter::VERSION
       end
       
       def inspect
diff --git a/lib/activerecord-sqlserver-adapter/version.rb b/lib/activerecord-sqlserver-adapter/version.rb
new file mode 100644
index 000000000..29169a468
--- /dev/null
+++ b/lib/activerecord-sqlserver-adapter/version.rb
@@ -0,0 +1,3 @@
+module ActiverecordSqlserverAdapter
+  VERSION = '3.2.4'
+end