Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SQLite3: Add collation support for string and text columns #20041

Merged
merged 1 commit into from May 28, 2015

Conversation

@akshay-vishnoi
Copy link
Contributor

commented May 6, 2015

Related with #19549
@rafaelfranca - Please have a look at it.

@akshay-vishnoi akshay-vishnoi force-pushed the akshay-vishnoi:sqlite_collation branch from c1ed319 to 6724c24 May 7, 2015

@akshay-vishnoi akshay-vishnoi force-pushed the akshay-vishnoi:sqlite_collation branch from 6724c24 to 7b17648 May 19, 2015

@@ -86,6 +86,11 @@ def add_column_options!(sql, options)
if options[:primary_key] == true
sql << " PRIMARY KEY"
end

if options[:collation].present?

This comment has been minimized.

Copy link
@rafaelfranca

rafaelfranca May 20, 2015

Member

Do SQL Server and Oracle have support to collation? If not we should not move to abstract adapter.

This comment has been minimized.

Copy link
@yahonda

yahonda May 20, 2015

Contributor

As far as I know Oracle database does not have collation support.

This comment has been minimized.

Copy link
@rafaelfranca

rafaelfranca May 20, 2015

Member

@akshay-vishnoi So we should move it back to each adapter individually.

@rafaelfranca

This comment has been minimized.

Copy link
Member

commented May 20, 2015

@akshay-vishnoi thank you for the pull request and really sorry for not merging yours before.

@akshay-vishnoi akshay-vishnoi force-pushed the akshay-vishnoi:sqlite_collation branch from 7b17648 to d5f93c1 May 24, 2015

@akshay-vishnoi

This comment has been minimized.

Copy link
Contributor Author

commented May 24, 2015

@rafaelfranca - No problem. I have updated the PR please check it now.

@akshay-vishnoi akshay-vishnoi force-pushed the akshay-vishnoi:sqlite_collation branch from d5f93c1 to 8c8a9f1 May 26, 2015

@akshay-vishnoi

This comment has been minimized.

Copy link
Contributor Author

commented May 26, 2015

Rebase done!!! 😄

@akshay-vishnoi akshay-vishnoi force-pushed the akshay-vishnoi:sqlite_collation branch from 8c8a9f1 to 3932912 May 28, 2015

@akshay-vishnoi

This comment has been minimized.

Copy link
Contributor Author

commented May 28, 2015

@rafaelfranca - Rebase done again. I think changelog will create conflicts again. Please let me know when you review the PR i will rebase it then if there will be conflicts. 😄

@rafaelfranca rafaelfranca merged commit 3932912 into rails:master May 28, 2015

rafaelfranca added a commit that referenced this pull request May 28, 2015
Merge pull request #20041 from akshay-vishnoi/sqlite_collation
SQLite3: Add collation support for string and text columns
statement.stubs(:columns).once.returns([])
statement.expects(:close).once
SQLite3::Statement.stubs(:new).returns(statement)
::SQLite3::Statement.stubs(:new).returns(statement)

This comment has been minimized.

Copy link
@vipulnsward

vipulnsward May 29, 2015

Member

Were these needed?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.