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

Merge origin 2.8.5 #14

Merged
merged 140 commits into from
Dec 23, 2016
Merged

Merge origin 2.8.5 #14

merged 140 commits into from
Dec 23, 2016

Conversation

keredson
Copy link
Owner

merging coleifer/peewee 2.8.5 into our version.

Charles Leifer and others added 30 commits May 4, 2016 13:08
Wrap retry operation in ExceptionWrapper, fixes coleifer#922
721ba87
Allow the ObjectIdDescriptor to be used in queries. Refs coleifer#895
47d7694
Fix coleifer#930, UnknownField implements __init__ method.
17866ff
Refs coleifer#932, when hashing index columns, ensure result is 64 ch…
3cb3c3b 
…ars max.
Update API docs for the scalar() method. Refs coleifer#935
336b8be
Attempt to get converter. Refs coleifer#935.
8cfec65
Whoops, fix pwiz UnknownObject definition.
6cf5c72
Add property to indicate if C extensions are loaded.
6e9a4bf
Fixes coleifer#939, types not coerced correctly in pool.
886bd68
Adding new TimestampField for compact representations of dates and
e41632b 
times.
so tired...pick it back up later
8d337a0
Noop
ecfb2d5
Clean up, correct semantics for timestamp <-> datetime
89e26ea
Small fixes.
5d5a1e2
Fix MySQL after googling.
414a4ad
Field db_value() can return Node objects (finally)
1c7655e
Most postgres tests appear to be passing.
75fcc66
Merge branch 'param-refactor'
5706fba
Fix a bug where running all tests with sqlite (while postgres is
e4bd8e6 
    installed and available), would cause failures while creating the
fixture models, as the TestingID model was pointing at a non-existant
SQLite database.
Fixes coleifer#933, test that blob field with proxy db is initialized…
b2d52ba 
… correctly.
Support the WITHOUT ROWID optimization.
085a949
Fix for computed cols.
5be1bd3
Fix db_url to include blanks and convert types. Fixes coleifer#858
2b552a2
Whoops, big mistake in the timestamp calculator.
8bb6e29
Allow attribute to be absent.
b8286cc
Skip it.
8cedadd
Return value from parent save/delete in signals. Fixes coleifer#947
3ebc436
Add extension import to pwiz if required by schema. Fixes coleifer#929
4274748
Update insert_many with caveats about sqlite. Fixes coleifer#948
0cf8988
@dhaase-de
workaround for issue 820 (Cython support is disabled for old Cython v…
80e0ae7 
…ersions)
akrs and others added 29 commits September 13, 2016 20:53
@akrs
fixed a problem with TimestampField resolution
b38972c
@akrs
fixed unit test
7d56163
Merge pull request coleifer#1061 from akrs/master
a3e1fa1 
fixed a problem with TimestampField resolution
Cleaning up and slimming down the sqlite queue db.
5a78656
Doc updates, refs coleifer#1059
70745f6
Remove old cruft.
7dac834
Tests for sqliteq
508d827
Allow deferred relation to be used multiple times, fixes coleifer#1072
e76b5d9
Allow thread helper to be pluggable.
6ffeb78
Fix kwargs reference.
ae4fa56
Add test related to coleifer#1073. Unable to replicate.
3953132
@stenci
Add connection management documentation for CherryPy
670f486
Fix failing test?
15b95c1
Since this changes the db's journal mode to WAL, make sure to delete it
36a5f32 
as it was causing subsequent tests to fail.
Big refactor of speedups metadata collection in the optimized query
ba36e52 
results wrapper. I believe this fixes coleifer#1073.
Add test, fixed coleifer#1073.
f3de5ca
Merge pull request coleifer#1075 from stenci/patch-1
c2bf490 
Add connection management documentation for CherryPy
py3k fix. Refs coleifer#1071.
36ec507
Code cleanup based on cleanups made to speedups module.
cec6931
Adding method to tell if db is stopped.
a6d77c2
Use exc.args instead of message, fixes coleifer#1083
0710d9e
2.8.4
f963e3c
Starting docs on sqliteq
7776ba2
Use parentheses for compound select with MySQL. Fixes coleifer#1081
d85265d
Remove "clean_prefetch_subquery" as I'm not sure why it exists in the
1c23742 
first place. Ugh, need to write better commit messages!
Skip this test with MySQL.
7119b25
2.8.5
9628b77
Merge tag '2.8.5' into merge-origin-2.8.5
b7ca631
fixes for unit tests
c4a4dd6
@keredson keredson merged commit f9a17a9 into master Dec 23, 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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@keredson @coleifer @dhaase-de @jberkel @Zverik @joeyespo @paulbooth @akrs @stenci