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

From DAL to new pyDAL #561

Merged
merged 22 commits into from Jan 23, 2015
Merged

From DAL to new pyDAL #561

merged 22 commits into from Jan 23, 2015

Conversation

gi0baro
Copy link
Member

@gi0baro gi0baro commented Dec 15, 2014

Implementation strategy:

  • git submodule in gluon/packages/dal
  • pyDAL module import to sys.modules in gluon/__init__.py

Major changes in web2py:

  • dal imports rewrite
  • DAL subclassing to add web2py's features
  • pyDAL exceptions handling
  • removed old DAL tests
  • introduced specific web2py DAL tests (to be expanded)

TODO:

  • check applications for old imports
  • check contrib modules for old imports

@gi0baro gi0baro mentioned this pull request Dec 15, 2014
Closed
@gi0baro gi0baro mentioned this pull request Dec 24, 2014
Merged
@gi0baro
Copy link
Member Author

gi0baro commented Dec 24, 2014

I'm sorry about the mess.
Btw, the PR is back ready for the merge using latest pyDAL.

@gi0baro
Tracking pyDAL v0.12.25
2a28785
@gi0baro
Updated directory structure for pydal integration
21cb35d
@gi0baro
Merge branch 'master' into pydal-pip
4b337c3 
Conflicts:
	gluon/__init__.py
	gluon/dal/_load.py
	gluon/dal/adapters/base.py
	gluon/dal/adapters/google.py
	gluon/dal/adapters/postgres.py
	gluon/dal/adapters/teradata.py
	gluon/dal/base.py
	gluon/dal/objects.py
	gluon/tests/__init__.py
	gluon/tests/test_dal_nosql.py
@gi0baro
Updated tools tests for pydal
5043731
@gi0baro
Copy link
Member Author

gi0baro commented Jan 17, 2015

I've merged the latest master into PR. Now it's auto-mergeable again.

gi0baro and others added 3 commits January 18, 2015 18:14
@gi0baro
Fix import in dal.py
2277f65
@gi0baro
Fix uuid attribute of DAL
ff43ab7 
It's a bound method: requires instance as first parameter
@gi0baro
Merge branch 'master' of https://github.com/web2py/web2py into pydal-pip
7d6e473 
Conflicts:
	gluon/dal/_load.py
@gi0baro
Copy link
Member Author

gi0baro commented Jan 22, 2015

Auto-mergeable again.

@mdipierro mdipierro merged commit 7d6e473 into web2py:master Jan 23, 2015
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.

None yet
2 participants
@gi0baro @mdipierro