Skip to content

Commit 15a5456

Browse files
committed
Merged ebryn's changes, upcased some SQL keywords to make it easier to read logs
1 parent cc0f6cc commit 15a5456

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/active_record/connection_adapters/sqlserver_adapter.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ def add_order_by_for_association_limiting!(sql, options)
540540
# $2 = 'column_name'
541541
# $3 = ' asc'
542542
str =~ /((?:\w+\.)?\[?(\w+)\]?)(\s+asc|\s+desc)?/i
543-
fields << "min(#{$1}) AS #{$2}"
543+
fields << "MIN(#{$1}) AS #{$2}"
544544
order << "#{$2}#{$3}"
545545
end
546546

@@ -566,15 +566,15 @@ def drop_database(name)
566566
# Argument:
567567
# +table_name+:: (String) Name of the table to be cleared and reset
568568
def truncate(table_name)
569-
execute("truncate table #{table_name}; DBCC CHECKIDENT ('#{table_name}', RESEED, 1)")
569+
execute("TRUNCATE TABLE #{table_name}; DBCC CHECKIDENT ('#{table_name}', RESEED, 1)")
570570
end #truncate
571571

572572
def create_database(name)
573573
execute "CREATE DATABASE #{name}"
574574
end
575575

576576
def current_database
577-
@connection.select_one("select DB_NAME()")[0]
577+
@connection.select_one("SELECT DB_NAME()")[0]
578578
end
579579

580580
def tables(name = nil)
@@ -640,7 +640,7 @@ def remove_column(table_name, column_name)
640640
end
641641

642642
def remove_default_constraint(table_name, column_name)
643-
constraints = select "select def.name from sysobjects def, syscolumns col, sysobjects tab where col.cdefault = def.id and col.name = '#{column_name}' and tab.name = '#{table_name}' and col.id = tab.id"
643+
constraints = select "SELECT def.name FROM sysobjects def, syscolumns col, sysobjects tab WHERE col.cdefault = def.id AND col.name = '#{column_name}' AND tab.name = '#{table_name}' AND col.id = tab.id"
644644

645645
constraints.each do |constraint|
646646
execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint["name"]}"

0 commit comments

Comments
 (0)