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

User id to id #591

Merged
merged 7 commits into from Jul 8, 2016
Merged

User id to id #591

merged 7 commits into from Jul 8, 2016

Conversation

stijnhau
Copy link

@stijnhau stijnhau commented Jun 7, 2015

Changed the user_id field to id.
Fixes #589

Danielss89
Danielss89 reviewed Jun 7, 2015
View reviewed changes
data/schema.sqlite.sql
@@ -1,6 +1,6 @@
CREATE TABLE user
(
user_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
user INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be id

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still missing this

Danielss89
Danielss89 reviewed Jun 7, 2015
View reviewed changes
data/schema.mysql.sql
@@ -1,6 +1,6 @@
CREATE TABLE `user`
(
`user_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
`user` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be id

@stijnhau
Copy link
Author

stijnhau commented Jun 7, 2015

Fixed the mistake in those sql filles.

@Danielss89 Danielss89 added this to the 2.0.0 milestone Jun 7, 2015
@stijnhau
Copy link
Author

stijnhau commented Jun 7, 2015

also corrected in In data/schema.sqlite.sql:

@Danielss89
Copy link
Member

👍

@stijnhau stijnhau mentioned this pull request Jun 9, 2015
Open
@stijnhau
Copy link
Author

stijnhau commented Jun 9, 2015

https://github.com/ZF-Commons/ZfcUserDoctrineORM/pull/95/files
For the doctrine versions.

@stijnhau
Copy link
Author

Any progress on this?

@Danielss89
Copy link
Member

This is for 2.0 which is still in the future, so i'll keep them as PR's until i'm ready to do more about it.

@stijnhau
Copy link
Author

Totaly fine you dont work hard on it now.
But i suggest merging already because of someone else does a PR it van create merge conflict.
And those can be a bitch

@stijnhau
Copy link
Author

Any progress on this merge?

@stijnhau
Copy link
Author

stijnhau commented Jul 8, 2016

Maybe the PR can be merged in?

@Danielss89 Danielss89 merged commit 30a38e4 into ZF-Commons:master Jul 8, 2016
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
BC break Enhancement Refactoring
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@stijnhau @Danielss89