Skip to content

Commit cc0f6cc

Browse files
committed
Merge branch 'master' of git://github.com/ebryn/rails-sqlserver-adapter
2 parents 3369fee + c2e6d1d commit cc0f6cc

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ def identity_column(table_name)
740740
def query_requires_identity_insert?(sql)
741741
table_name = get_table_name(sql)
742742
id_column = identity_column(table_name)
743-
sql =~ /\[#{id_column}\]/ ? table_name : nil
743+
sql =~ /INSERT[^(]+\([^)]*\[#{id_column}\][^)]*\)/ ? table_name : nil
744744
end
745745

746746
def change_order_direction(order)

rails-sqlserver-adapter.gemspec

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Gem::Specification.new do |s|
2+
s.name = %q{activerecord-sqlserver-adapter}
3+
s.version = "1.0.1"
4+
5+
s.specification_version = 2 if s.respond_to? :specification_version=
6+
7+
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8+
s.authors = ["Tom Ward"]
9+
s.date = %q{2008-06-03}
10+
s.email = %q{tom@popdog.net}
11+
s.files = ["lib/active_record/connection_adapters/sqlserver_adapter.rb"]
12+
s.homepage = %q{http://wiki.rubyonrails.org/rails/pages/SQL+Server}
13+
s.require_paths = ["lib"]
14+
s.rubyforge_project = %q{activerecord}
15+
s.rubygems_version = %q{1.1.1}
16+
s.summary = %q{SQL Server adapter for Active Record}
17+
18+
s.add_dependency(%q<activerecord>, [">= 1.15.5.7843"])
19+
end

0 commit comments

Comments
 (0)