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.

Sign up for GitHub

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

Jump to bottom

Add method in Table annotation to set column Id name. #175

Merged
merged 1 commit into from
Mar 2, 2014
Merged

Add method in Table annotation to set column Id name. #175

merged 1 commit into from
Mar 2, 2014

Conversation

hube
Copy link
Contributor

@hube hube commented Jan 28, 2014

I merged #132 with the latest master. I couldn't figure out how to submit these changes to that PR, so I created this one instead.

Add method in Table annotation for set column Id name.
9681d06 
This fixes Issue #83

example:
@table(name = "Items", id = BaseColumns._ID)
public class Item extends Model {...}

Conflicts:
	src/com/activeandroid/Model.java
	src/com/activeandroid/TableInfo.java
@joshuapinter
Copy link
Contributor

@SeanPONeil Can we get this pull request merged in, seems like a key feature to be able to set the Id column. What's nice is that it defaults to the regular "Id" unless you specifically set it, so it shouldn't cause any conflict.

SeanPONeil added a commit that referenced this pull request Mar 2, 2014
@SeanPONeil
Merge pull request #175 from hube/add_id_annotation
6ab1e05 
Add method in Table annotation to set column Id name.
@SeanPONeil SeanPONeil merged commit 6ab1e05 into pardom-zz:master Mar 2, 2014
@SeanPONeil
Copy link
Contributor

I should have waited for the Travis build to pass before merging :/. Any idea why this is failing?

@joshuapinter
Copy link
Contributor

I'll take a look.

joshuapinter added a commit to joshuapinter/ActiveAndroid that referenced this pull request Mar 3, 2014
@joshuapinter
Fixes issue from Pull Request pardom-zz#175 with custom Id column name.
0fca7ec 
Unique Groups and Index Groups caused a conflict with allowing for a custom Id column name.

This was discovered in Pull Request pardom-zz#175.
@joshuapinter joshuapinter mentioned this pull request Mar 3, 2014
Merged
@joshuapinter
Copy link
Contributor

I created another pull request to fix the issue raised with this pull request (is there a better way to do this?). If you merge that PR in the tests run swimmingly once again.

On a further note, it'd be great to require tests for this new functionality. The issue was due to the Index Groups and Unique Groups not being able to handle the custom Id column naming. I was able to work around it but without tests for those pieces I can't be certain they weren't affected.

SeanPONeil added a commit that referenced this pull request Mar 3, 2014
@SeanPONeil
Merge pull request #192 from joshuapinter/master
9adc7de 
Fixes Issue from Pull Request #175.
@hube
Copy link
Contributor Author

hube commented Mar 5, 2014

Thanks for merging! Sorry about the broken build, I didn't run the tests after I merged in the old PR :(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hube @joshuapinter @SeanPONeil