Merge remote-tracking branch 'FairLoan/master'

* FairLoan/master:
  Adding tests for double quoted identity delimiter
  Renaming def to line up with SQL terminology.
  Adding recognition of double quote (") as a valid quote delimiter

Author: kares

lib/arjdbc/mssql/utils.rb

@@ -23,29 +23,40 @@ def get_table_name(sql, qualified = nil)
 
       # protected
 
+      # See "Delimited Identifiers": http://msdn.microsoft.com/en-us/library/ms176027.aspx
+      def remove_identifier_delimiters(keyword)
+        if /\A(\[|")(.*)/m.match(keyword)
+          delim, rest = $1, $2
+          if delim == '[' && rest =~ /]\z/ || delim == '"' && rest =~ /"\z/
+            return rest.chop
+          end
+        end
+        keyword
+      end
+
       def unquote_table_name(table_name)
-        unquote_column_name(table_name)
+        remove_identifier_delimiters(table_name)
       end
 
       def unquote_column_name(column_name)
-        column_name.to_s.tr('[]', '')
+        remove_identifier_delimiters(column_name)
       end
 
       def unquote_string(string)
         string.to_s.gsub("''", "'")
       end
 
       def unqualify_table_name(table_name)
-        table_name.to_s.split('.').last.tr('[]', '')
+        remove_identifier_delimiters(table_name.to_s.split('.').last)
       end
 
       def unqualify_table_schema(table_name)
-        table_name.to_s.split('.')[-2].gsub(/[\[\]]/, '') rescue nil
+        remove_identifier_delimiters(table_name.to_s.split('.')[-2]) rescue nil
       end
 
       def unqualify_db_name(table_name)
         table_names = table_name.to_s.split('.')
-        table_names.length == 3 ? table_names.first.tr('[]', '') : nil
+        table_names.length == 3 ? remove_identifier_delimiters(table_names.first) : nil
       end
 
     end

test/db/mssql/identity_insert_test.rb

@@ -7,12 +7,15 @@ class MSSQLIdentityInsertTest < Test::Unit::TestCase
   def test_enable_identity_insert_when_necessary
     Entry.connection.execute("INSERT INTO entries([id], [title]) VALUES (333, 'Title')")
     Entry.connection.execute("INSERT INTO entries([title], [id]) VALUES ('Title', 344)")
+    Entry.connection.execute(%Q(INSERT INTO entries("id", "title") VALUES (444, 'Title')))
+    Entry.connection.execute(%Q(INSERT INTO entries("title", "id") VALUES ('Title', 455)))
     Entry.connection.execute("INSERT INTO entries(id, title) VALUES (666, 'Title')")
     Entry.connection.execute("INSERT INTO entries(id, title) (SELECT id+123, title FROM entries)")
   end
 
   def test_dont_enable_identity_insert_when_unnecessary
     Entry.connection.execute("INSERT INTO entries([title]) VALUES ('[id]')")
+    Entry.connection.execute(%Q(INSERT INTO entries("title") VALUES ('"a memorable quote"')))
   end
 
 end