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

Already on GitHub? Sign in to your account

fix for #522: [rails 4.1] create_table_definition changed from 3 to 4 parameters #523

Closed
wants to merge 2 commits into
from

Conversation

Projects
None yet
2 participants
Contributor

garysweaver commented Dec 18, 2013

Just changing the method sig. for activerecord-jdbc-adapter's create_table_definition to be a pass-thru of args, since the #args changed in AR/Rails 4.1.beta1 to support "as" noted in #522.

@petergoldstein petergoldstein referenced this pull request in norman/friendly_id Dec 18, 2013

Merged

Rails 4.1 Support #504

@petergoldstein petergoldstein added a commit to petergoldstein/friendly_id that referenced this pull request Dec 18, 2013

@petergoldstein petergoldstein Make Finders compatible with Rails 4.1.x changes, allow Rails 4.1.x i…
…n gemspec, update Travis to test against this version. Temporary disable JRuby/Rails 4.1.x combination in Travis until this issue - jruby/activerecord-jdbc-adapter#523 - is addressed..
2f7a418
Owner

kares commented Dec 19, 2013

thanks - could we keep the old comment and maybe add on what the signature is on 4.1 - copying doc is useless ...

Contributor

garysweaver commented Dec 19, 2013

@kares Sure, will do. I started to do that originally, but then was concerned that it would just change again. :)

Contributor

garysweaver commented Dec 19, 2013

Would squash those 2 commits, but having the oddest problem with git modifying the following three files on close/checkout:

#   modified:   src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java
#   modified:   src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java
#   modified:   src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java

It isn't a autocrlf thing, either. It is almost like those three files have a different ref, like what git thinks their version should be differs from what they are content-wise. Never seen that before. Thought it might just be my fork but is that way with the main repo, and tried updating Git but I think there might be something wrong with the repo? Anyway, sorry for the long explanation. Hope that 2 commits without squashing is ok for now. :)

Owner

kares commented Dec 19, 2013

Thanks Gary, I'll handle this from here. The git issue is that you're on case-insensitive FS (likely Mac) ...

Owner

kares commented Dec 19, 2013

@kares kares closed this Dec 19, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment