From 3932912a5965f020999064ebde07b541394f72d4 Mon Sep 17 00:00:00 2001
From: Akshay Vishnoi <akshay.vishnoi@vinsol.com>
Date: Sun, 24 May 2015 11:54:02 +0530
Subject: Add collation support for string and text columns in SQLite3

---
 .../test/cases/adapters/sqlite3/collation_test.rb  | 53 ++++++++++++++++++++++
 .../cases/adapters/sqlite3/sqlite3_adapter_test.rb |  8 ++--
 2 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 activerecord/test/cases/adapters/sqlite3/collation_test.rb

(limited to 'activerecord/test/cases/adapters')

diff --git a/activerecord/test/cases/adapters/sqlite3/collation_test.rb b/activerecord/test/cases/adapters/sqlite3/collation_test.rb
new file mode 100644
index 0000000000..39e4620bc9
--- /dev/null
+++ b/activerecord/test/cases/adapters/sqlite3/collation_test.rb
@@ -0,0 +1,53 @@
+require "cases/helper"
+require 'support/schema_dumping_helper'
+
+class SQLite3CollationTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
+  def setup
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table :collation_table_sqlite3, force: true do |t|
+      t.string :string_nocase, collation: 'NOCASE'
+      t.text :text_rtrim, collation: 'RTRIM'
+    end
+  end
+
+  def teardown
+    @connection.drop_table :collation_table_sqlite3, if_exists: true
+  end
+
+  test "string column with collation" do
+    column = @connection.columns(:collation_table_sqlite3).find { |c| c.name == 'string_nocase' }
+    assert_equal :string, column.type
+    assert_equal 'NOCASE', column.collation
+  end
+
+  test "text column with collation" do
+    column = @connection.columns(:collation_table_sqlite3).find { |c| c.name == 'text_rtrim' }
+    assert_equal :text, column.type
+    assert_equal 'RTRIM', column.collation
+  end
+
+  test "add column with collation" do
+    @connection.add_column :collation_table_sqlite3, :title, :string, collation: 'RTRIM'
+
+    column = @connection.columns(:collation_table_sqlite3).find { |c| c.name == 'title' }
+    assert_equal :string, column.type
+    assert_equal 'RTRIM', column.collation
+  end
+
+  test "change column with collation" do
+    @connection.add_column :collation_table_sqlite3, :description, :string
+    @connection.change_column :collation_table_sqlite3, :description, :text, collation: 'RTRIM'
+
+    column = @connection.columns(:collation_table_sqlite3).find { |c| c.name == 'description' }
+    assert_equal :text, column.type
+    assert_equal 'RTRIM', column.collation
+  end
+
+  test "schema dump includes collation" do
+    output = dump_table_schema("collation_table_sqlite3")
+    assert_match %r{t.string\s+"string_nocase",\s+collation: "NOCASE"$}, output
+    assert_match %r{t.text\s+"text_rtrim",\s+collation: "RTRIM"$}, output
+  end
+end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 27f4ba8eb6..6be9795603 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -421,14 +421,14 @@ module ActiveRecord
       end
 
       def test_statement_closed
-        db = SQLite3::Database.new(ActiveRecord::Base.
+        db = ::SQLite3::Database.new(ActiveRecord::Base.
                                    configurations['arunit']['database'])
-        statement = SQLite3::Statement.new(db,
+        statement = ::SQLite3::Statement.new(db,
                                            'CREATE TABLE statement_test (number integer not null)')
-        statement.stubs(:step).raises(SQLite3::BusyException, 'busy')
+        statement.stubs(:step).raises(::SQLite3::BusyException, 'busy')
         statement.stubs(:columns).once.returns([])
         statement.expects(:close).once
-        SQLite3::Statement.stubs(:new).returns(statement)
+        ::SQLite3::Statement.stubs(:new).returns(statement)
 
         assert_raises ActiveRecord::StatementInvalid do
           @conn.exec_query 'select * from statement_test'
-- 
cgit v1.2.3