Skip to content

Commit 2a96401

Browse files
committed
Fixes ruby and sql syntax errors in adapter. Add myself as maintainer. [#1 state:resolved]
1 parent 5117e3a commit 2a96401

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@
2121
# Modifications (Numerous fixes as maintainer): Ryan Tomayko <rtomayko@gmail.com>
2222
# Date: Up to July 2006
2323

24-
# Current maintainer: Tom Ward <tom@popdog.net>
24+
# Previous maintainer: Tom Ward <tom@popdog.net>
25+
#
26+
27+
# Current maintainer: Shawn Balestracci <shawn@vegantech.com>
2528

2629
module ActiveRecord
2730
class Base
@@ -197,7 +200,8 @@ def new_time(year, mon, mday, hour, min, sec, microsec = 0)
197200
return nil if year.nil? || year == 0
198201
Time.time_with_datetime_fallback(Base.default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
199202
end
200-
end
203+
end #class << self
204+
end #SQLServerColumn
201205

202206
# In ADO mode, this adapter will ONLY work on Windows systems,
203207
# since it relies on Win32OLE, which, to my knowledge, is only
@@ -368,7 +372,7 @@ def columns(table_name, name = nil)
368372
AND constraint_column_usage.column_name = columns.column_name
369373
)
370374
WHERE columns.TABLE_NAME = '#{table_name}'
371-
ORDER BY cols.COLUMN_NAME
375+
ORDER BY columns.COLUMN_NAME
372376
}
373377
# ORDER BY columns.ordinal_position
374378
result = select(sql, name, true)
@@ -809,3 +813,4 @@ def set_utf8_values!(sql)
809813
end #class SQLServerAdapter < AbstractAdapter
810814
end #module ConnectionAdapters
811815
end #module ActiveRecord
816+

0 commit comments

Comments
 (0)