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

Add DateTime/Date/TimeOfDay support. Simplify EF7 entity update logic. #278

Merged
merged 3 commits into from Jan 21, 2016
Merged

Add DateTime/Date/TimeOfDay support. Simplify EF7 entity update logic. #278

merged 3 commits into from Jan 21, 2016

Conversation

rayao
Copy link
Contributor

@rayao rayao commented Jan 19, 2016

#273

Also, removed EF.SqlServer dependency from Restier.EF7

return EdmCoreModel.Instance.GetDate(efProperty.Nullable);
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Is your code written specially for EF7 here? I am not sure about the difference that in my code the DB type name comes from the ColumnAttribute. But I guess we can keep both code here and use a compilation constant to differentiate EF6 and EF7?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No this works only for EF6, EF7 has a much cleaner approach.
EF7 shares most code files from EF6, but has dedicated ModelProducer and ChangeSetPreparer.

@rayao
Copy link
Contributor Author

rayao commented Jan 20, 2016

Hi Lewis, perhaps I'd better remove all EF6 changes to make your merge easier? Or you can check in first and let me merge.

@lewischeng-ms
Copy link
Contributor

@rayao, my PR need to be based on yours and use some code you wrote. So please address the comments and merge this PR first if all tests can pass and there is no code analysis issue during compilation. Thanks!

rayao added a commit that referenced this pull request Jan 21, 2016
Add DateTime/Date/TimeOfDay support. Simplify EF7 entity update logic.
Borrowed Northwind DB config changes from Lewis's PR, to make baseline test pass.
@rayao rayao merged commit 7f71b2c into OData:master Jan 21, 2016
@rayao rayao deleted the BugFix branch January 21, 2016 05:33
@rayao rayao restored the BugFix branch January 21, 2016 05:34
@rayao
Copy link
Contributor Author

rayao commented Jan 21, 2016

Sorry I messed up the branch hierarchy. Didn't notice there're check-ins before merge. Since it tells me "no conflict", I took that for "no change since last sync".
I'm not very familiar with git commands, I'm afraid of messing it up further, could someone help restore a single lineage?

@lewischeng-ms
Copy link
Contributor

@rayao Don't worry about that. You didn't mess up the master branch history. It's OK to merge a pull request like this. For future, if you want to make the commits a single line, you can first do a git pull --rebase OData master to pull and rebase all the latest changes from OData/master then do a git push OData master to check in.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants