activerecord-sqlserver-adapter-schemas 1.0.1 → 1.0.2

data/lib/active_record/schemas/connection_adapters/sqlserver_adapter.rb

@@ -3,15 +3,6 @@ module Schemas
 module ConnectionAdapters
   
 module SqlserverAdapter
-  
-  # When this module is included, the following methods are chained in order
-  # to strip off the schema names if the schema is the default schema
-  def self.included(base)
-    base.alias_method_chain :columns, :default_schema_check
-    base.alias_method_chain :table_exists?, :default_schema_check
-    base.alias_method_chain :table_name_or_views_table_name, :default_schema_check
-  end
-  
   def default_schema
     unless sqlserver_2000?
       @default_schema ||= select_values("SELECT default_schema_name FROM sys.database_principals WHERE type = 'S' and name = '#{self.quote_string(@connection_options[:username])}'").first
@@ -20,21 +11,6 @@ module SqlserverAdapter
   end
   attr_writer :default_schema
   
-  def table_name_or_views_table_name_with_default_schema_check(table_name)
-    table_name = unqualify_table_name_if_default_schema(table_name)
-    table_name_or_views_table_name_without_default_schema_check(table_name)
-  end
-  
-  def table_exists_with_default_schema_check?(table_name)
-    table_name = unqualify_table_name_if_default_schema(table_name)
-    table_exists_without_default_schema_check?(table_name)
-  end
-  
-  def columns_with_default_schema_check(table_name, column_name = nil)
-    table_name = unqualify_table_name_if_default_schema(table_name) if table_name
-    columns_without_default_schema_check(table_name, column_name)
-  end
-  
   def unqualify_schema_name(table_name)
     parts = table_name.to_s.split('.')
     parts.length == 1 || parts[parts.length - 2].blank? ? default_schema : parts[parts.length - 2].gsub(/[\[\]]/,'')

data/lib/activerecord-sqlserver-adapter-schemas.rb

@@ -12,6 +12,16 @@ end
 class ActiveRecord::ConnectionAdapters::SQLServerAdapter
   include ActiveRecord::Schemas::ConnectionAdapters::SqlserverAdapter
   
+  def table_exists?(table_name)
+    table_name = unqualify_table_name_if_default_schema(table_name)
+    super(table_name) || tables.include?(table_name) || views.include?(table_name)
+  end
+  
+  def table_name_or_views_table_name(table_name)
+    unquoted_table_name = unqualify_table_name_if_default_schema(table_name)
+    views.include?(unquoted_table_name) ? view_table_name(unquoted_table_name) : unquoted_table_name
+  end
+  
   # This method is overridden to support linked servers
   def unqualify_db_name(table_name)
     table_names = table_name.to_s.split('.')
@@ -31,12 +41,20 @@ class ActiveRecord::ConnectionAdapters::SQLServerAdapter
   # This method is overridden to support schema names
   def views(name = nil)
     # return schema.view unless the schema is the default schema, in which case just return view
-    @sqlserver_views_cache ||= 
-      info_schema_query do
-         select_values("SELECT TABLE_SCHEMA + '.' + TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME NOT IN ('sysconstraints','syssegments')").collect do |view|
-           default_schema && view.index("#{default_schema}.") == 0 ? view[default_schema.length + 1..view.length] : view
-         end
-      end
+    info_schema_query do
+      select_values("SELECT TABLE_SCHEMA + '.' + TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME NOT IN ('sysconstraints','syssegments')").collect do |view|
+        default_schema && view.index("#{default_schema}.") == 0 ? view[default_schema.length + 1..view.length] : view
+       end
+    end
+  end
+  
+  def columns(table_name, name = nil)
+    return [] if table_name.blank?
+    cache_key = unqualify_table_name_if_default_schema(table_name)
+    @sqlserver_columns_cache[cache_key] ||= column_definitions(table_name).collect do |ci|
+      sqlserver_options = ci.except(:name,:default_value,:type,:null).merge(:database_year=>database_year)
+      ::ActiveRecord::ConnectionAdapters::SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
+    end
   end
   
   # This method is overridden to support references such as database..table

data/test/schemas/connection.rb

@@ -0,0 +1,28 @@
+require 'rubygems'
+require 'active_record'
+require 'activerecord-sqlserver-adapter'
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'activerecord-sqlserver-adapter-schemas')
+
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => 'sqlserver',
+    :mode     => 'ODBC',
+    :host     => 'localhost',
+    :username => 'rails',
+    :dsn      => ENV['ACTIVERECORD_UNITTEST_DSN'] || 'activerecord_unittest',
+    :database => 'activerecord_unittest'
+  }
+}
+ActiveRecord::Base.establish_connection 'arunit'
+ActiveRecord::Base.connection.default_schema = 'dbo'
+
+unless ActiveRecord::Base.connection.table_exists?('schema_checks')
+  ActiveRecord::Base.connection.create_table 'schema_checks' do |table|
+    table.string :name, :limit => 32
+    table.timestamps
+  end
+end
+
+unless ActiveRecord::Base.connection.table_exists?('schema_checks_view')
+  ActiveRecord::Base.connection.execute "create view schema_checks_view as select * from schema_checks"
+end

data/test/schemas/definitions.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'connection')
+
+module Schemas
+  
+class Definitions < Test::Unit::TestCase
+  def setup
+    con.default_schema = 'dbo'
+  end
+  
+  def test_column_definitions
+    assert con.column_definitions('schema_checks').length.nonzero?
+    assert con.column_definitions('dbo.schema_checks').length.nonzero?
+    assert con.column_definitions('activerecord_unittest..schema_checks').length.nonzero?
+    assert con.column_definitions('activerecord_unittest.dbo.schema_checks').length.nonzero?
+    assert con.column_definitions('foo.schema_checks').length.zero?
+    
+    con.default_schema = 'foo'
+    assert con.column_definitions('schema_checks').length.zero?
+    assert con.column_definitions('dbo.schema_checks').length.nonzero?
+    assert con.column_definitions('activerecord_unittest..schema_checks').length.zero?
+    assert con.column_definitions('activerecord_unittest.dbo.schema_checks').length.nonzero?
+    assert con.column_definitions('activerecord_unittest.foo.schema_checks').length.zero?
+  end
+  
+  def test_view_information
+    assert_nil con.view_information 'foo.schema_checks_view'
+    assert_not_nil con.view_information 'dbo.schema_checks_view'
+    assert_not_nil con.view_information 'schema_checks_view'
+    assert_not_nil con.view_information 'activerecord_unittest.dbo.schema_checks_view'
+    assert_not_nil con.view_information 'activerecord_unittest..schema_checks_view'
+  end
+  
+  def test_columns
+    assert con.columns('schema_checks').length.nonzero?
+    assert con.columns('dbo.schema_checks').length.nonzero?
+    assert con.columns('foo.schema_checks').length.zero?
+    assert con.columns('activerecord_unittest..schema_checks').length.nonzero?
+    assert con.columns('activerecord_unittest.dbo.schema_checks').length.nonzero?
+    assert con.columns('activerecord_unittest.foo.schema_checks').length.zero?
+  end
+  
+  def con
+    con = ActiveRecord::Base.connection
+  end
+end
+
+end

data/test/schemas/quoting.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'connection')
+
+module Schemas
+  
+class Quoting < Test::Unit::TestCase
+  def setup
+    con.default_schema = 'dbo'
+  end
+  
+  def test_quote_column_name
+    assert_equal con.quote_column_name('schema_checks'), '[schema_checks]'
+    assert_equal con.quote_column_name('dbo.schema_checks'), '[dbo].[schema_checks]'
+    assert_equal con.quote_column_name('activerecord_unittest..schema_checks'), '[activerecord_unittest]..[schema_checks]'
+    assert_equal con.quote_column_name('activerecord_unittest.dbo.schema_checks'), '[activerecord_unittest].[dbo].[schema_checks]'
+  end
+  
+  def con
+    con = ActiveRecord::Base.connection
+  end
+end
+
+end

data/test/schemas/table_checks.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'connection')
+
+module Schemas
+  
+class TableChecks < Test::Unit::TestCase
+  def setup
+    con.default_schema = 'dbo'
+  end
+  
+  def test_tables
+    # test that tables() prefixes the table name with the schema if the schema is not the default schema
+    assert_nil con.tables.find { |table| table.start_with?('dbo.') }
+    con.default_schema = 'foo'
+    assert_not_nil con.tables.find { |table| table.start_with?('dbo.') }
+  end
+  
+  def test_views
+    # test that views() prefixes the table name with the schema if the schema is not the default schema
+    assert_nil con.views.find { |table| table.start_with?('dbo.') }
+    con.default_schema = 'foo'
+    assert_not_nil con.views.find { |table| table.start_with?('dbo.') }
+  end
+  
+  def test_table_exists
+    assert con.table_exists?('dbo.schema_checks')
+    assert con.table_exists?('schema_checks')
+    assert !con.table_exists?('foo.schema_checks')
+    
+    con.default_schema = 'foo'
+    assert con.table_exists?('dbo.schema_checks')
+    assert !con.table_exists?('schema_checks')
+    assert !con.table_exists?('foo.schema_checks')
+  end
+  
+  def test_table_name_or_views_table_name
+    assert_equal con.table_name_or_views_table_name('schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('dbo.schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('activerecord_unittest.dbo.schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('activerecord_unittest..schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('activerecord_unittest.foo.schema_checks'), 'activerecord_unittest.foo.schema_checks'
+    assert_equal con.table_name_or_views_table_name('foo.schema_checks'), 'foo.schema_checks'
+    
+    con.default_schema = 'foo'
+    assert_equal con.table_name_or_views_table_name('schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('dbo.schema_checks'), 'dbo.schema_checks'
+    assert_equal con.table_name_or_views_table_name('activerecord_unittest.dbo.schema_checks'), 'activerecord_unittest.dbo.schema_checks'
+    assert_equal con.table_name_or_views_table_name('activerecord_unittest..schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('activerecord_unittest.foo.schema_checks'), 'schema_checks'
+    assert_equal con.table_name_or_views_table_name('foo.schema_checks'), 'schema_checks'
+  end
+  
+  def con
+    con = ActiveRecord::Base.connection
+  end
+end
+
+end

data/test/schemas/unqualify.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'connection')
+
+module Schemas
+  
+class Unqualify < Test::Unit::TestCase
+  def setup
+    con.default_schema = 'dbo'
+  end
+  
+  def test_unqualify_schema_name
+    assert_equal con.unqualify_schema_name('MyDatabase.foo.my_table'), 'foo'
+    assert_equal con.unqualify_schema_name('MyDatabase..my_table'), 'dbo'
+    assert_equal con.unqualify_schema_name('foo.MyTable'), 'foo'
+    assert_equal con.unqualify_schema_name('MyTable'), 'dbo'
+    assert_equal con.unqualify_schema_name('LinkedServer.MyDatabase.foo.my_table'), 'foo'
+  end
+  
+  def test_unqualify_table_name_if_default_schema
+    assert_equal con.unqualify_table_name_if_default_schema('my_table'), 'my_table'
+    
+    assert_equal con.unqualify_table_name_if_default_schema('dbo.my_table'), 'my_table'
+    assert_equal con.unqualify_table_name_if_default_schema('foo.my_table'), 'foo.my_table'
+    
+    # Are these next 3 tests really the correct behavior?
+    assert_equal con.unqualify_table_name_if_default_schema('MyDatabase..my_table'), 'my_table'
+    assert_equal con.unqualify_table_name_if_default_schema('LinkedServer.MyDatabase.dbo.my_table'), 'my_table'
+    assert_equal con.unqualify_table_name_if_default_schema('LinkedServer.MyDatabase.foo.my_table'), 'LinkedServer.MyDatabase.foo.my_table'
+  end
+  
+  def test_unqualify_db_name
+    assert_equal con.unqualify_db_name('LinkedServer.MyDatabase.dbo.my_table'), 'LinkedServer.MyDatabase'
+    assert_equal con.unqualify_db_name('MyDatabase.dbo.my_table'), 'MyDatabase'
+    assert_equal con.unqualify_db_name('MyDatabase..my_table'), 'MyDatabase'
+  end
+  
+  def con
+    con = ActiveRecord::Base.connection
+  end
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter-schemas
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Airlite Plastics
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -05:00
+date: 2010-07-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,6 +36,11 @@ files:
 - lib/activerecord-sqlserver-adapter-schemas.rb
 - lib/active_record/schemas/base.rb
 - lib/active_record/schemas/connection_adapters/sqlserver_adapter.rb
+- test/schemas/connection.rb
+- test/schemas/definitions.rb
+- test/schemas/quoting.rb
+- test/schemas/table_checks.rb
+- test/schemas/unqualify.rb
 has_rdoc: true
 homepage: 
 licenses: []