Include guid and default function support from rails 2-3-stable branch.

Author: metaskills

Diff for: CHANGELOG

@@ -1,6 +1,11 @@
 
 MASTER
 
+* 3.0.0
+
+* Release rails 3 version!
+
+
 * 2.3.8
 
 * Properly quote all database names in rake helper methods. [Ken Collins]
@@ -15,7 +20,7 @@ MASTER
 
 * Allow DNS's to not contain a database and use what is in database.yml [Marco Mastrodonato]
 
-* Rake tasks methods for vanallia rails :db namespace parity. [Ken Collins]
+* Rake tasks methods for vanilla rails :db namespace parity. [Ken Collins]
 
 * IronRuby integrated security fixes [Jimmy Schementi]
 
@@ -40,7 +45,7 @@ MASTER
 
 * Qualify INFORMATION_SCHEMA.COLUMNS with a correct period DB name if present.
 
-* Allow adapter to return multipe results sets, for example from stored procedures. [Chris Hall]
+* Allow adapter to return multiple results sets, for example from stored procedures. [Chris Hall]
 
 
 * 2.3.4

Diff for: lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -115,6 +115,14 @@ def run_with_isolation_level(isolation_level)
           end if block_given?
         end
 
+        def newid_function
+          select_value "SELECT NEWID()"
+        end
+        
+        def newsequentialid_function
+          select_value "SELECT NEWSEQUENTIALID()"
+        end
+        
         # === SQLServer Specific (Rake/Test Helpers) ==================== #
 
         def recreate_database

Diff for: lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -217,6 +217,9 @@ def column_definitions(table_name)
             ci[:default_value] = case ci[:default_value]
                                  when nil, '(null)', '(NULL)'
                                    nil
+                                 when /\A\((\w+\(\))\)\Z/
+                                   ci[:default_function] = $1
+                                   nil
                                  else
                                    match_data = ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/m)
                                    match_data ? match_data[1] : nil

Diff for: lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -105,6 +105,10 @@ def is_utf8?
         sql_type =~ /nvarchar|ntext|nchar/i
       end
 
+      def default_function
+        @sqlserver_options[:default_function]
+      end
+      
       def table_name
         @sqlserver_options[:table_name]
       end

Diff for: test/cases/specific_schema_test_sqlserver.rb

@@ -2,6 +2,14 @@
 
 class StringDefault < ActiveRecord::Base; end;
 class SqlServerEdgeSchema < ActiveRecord::Base; end;
+class SqlServerEdgeSchema < ActiveRecord::Base
+  attr_accessor :new_id_setting
+  before_create :set_new_id
+  protected
+  def set_new_id
+    self[:guid_newid] ||= connection.newid_function if new_id_setting
+  end
+end
 
 class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
 
@@ -91,7 +99,45 @@ class SpecificSchemaTestSqlserver < ActiveRecord::TestCase
 
     end
 
+    context 'with uniqueidentifier column' do
+
+      setup do
+        @newid = ActiveRecord::Base.connection.newid_function
+        assert_guid @newid
+      end
+
+      should 'allow a simple insert and read of a column without a default function' do
+        obj = @edge_class.create! :guid => @newid
+        assert_equal @newid, @edge_class.find(obj.id).guid
+      end
+      
+      should 'record the default function name in the column definition but still show a nil real default, will use one day for insert/update' do
+        newid_column = @edge_class.columns_hash['guid_newid']
+        assert newid_column.default_function.present?
+        assert_nil newid_column.default
+        assert_equal 'newid()', newid_column.default_function
+        newseqid_column = @edge_class.columns_hash['guid_newseqid']
+        assert newseqid_column.default_function.present?
+        assert_nil newseqid_column.default
+        assert_equal 'newsequentialid()', newseqid_column.default_function
+      end
+      
+      should 'use model callback to set get a new guid' do
+        obj = @edge_class.new
+        obj.new_id_setting = true
+        obj.save!
+        assert_guid obj.guid_newid
+      end
+
+    end
+    
   end
 
 
+  protected
+  
+  def assert_guid(guid)
+    assert_match %r|\w{8}-\w{4}-\w{4}-\w{4}-\w{12}|, guid
+  end
+  
 end

Diff for: test/schema/sqlserver_specific_schema.rb

@@ -63,8 +63,12 @@
     t.string :description
     t.column :bigint, :bigint
     t.column :tinyint, :tinyint
+    t.column :guid, :uniqueidentifier
   end
 
+  execute %|ALTER TABLE [sql_server_edge_schemas] ADD [guid_newid] uniqueidentifier DEFAULT NEWID();|
+  execute %|ALTER TABLE [sql_server_edge_schemas] ADD [guid_newseqid] uniqueidentifier DEFAULT NEWSEQUENTIALID();|
+  
   execute "IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = 'customers_view') DROP VIEW customers_view"
   execute <<-CUSTOMERSVIEW
     CREATE VIEW customers_view AS