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

Fix get in pydal.helpers.classes Reference class calling __getattr__ … #465

Merged
merged 2 commits into from Jun 20, 2017

Conversation

emman27
Copy link
Contributor

@emman27 emman27 commented May 16, 2017

…with 3 variables instead of 2 as per signature

…with 3 variables instead of 2 as per signature
@mdipierro
Copy link
Contributor

Can you explain the rationale for this change?

@emman27
Copy link
Contributor Author

emman27 commented Jun 6, 2017

@mdipierro if you look at the method signature:
def __getattr__(self, key):.
However, the current code calling this method is
return self.__getattr__(key, default)
Since self is automatically prepended onto the method call, this raises a TypeError.
The code for __getattr__ is in fact fine and does not handle the default case,, whereas for get which was changed in this PR, the default case is incorrectly passed on instead of directly handled

@mdipierro
Copy link
Contributor

I think a better solution than is to add a default option to

base.py:    def __getattr__(self, key): to __getattr__(self, key, default=None)
objects.py:    def __getattr__(self, k): to __getattr__(self, k, default=None)

because help(getattr) allows of a default option. Also we do not want to get the default is the attribute is defined and its value is 0 or ''.

If I agree, may I ask you to make this change? else I can do it.

@emman27
Copy link
Contributor Author

emman27 commented Jun 6, 2017

You're right on that count. However I think the fix that needs to be made is in line 216 (onwards) of https://github.com/web2py/pydal/blob/master/pydal/helpers/classes.py, where it should read, letting the underlying default be handled by the get method in objects.py which already works fine in handling defaults in the case of KeyErrors (I am assuming here that self._record refers to a Row object, correct me if I am wrong)

def __getattr__(self, key, default=None): # Change made here to include default in method signature
        if key == 'id':
            return long(self)
        if key in self._table:
            self.__allocate()
        if self._record:
            # to deal with case self.update_record()
            return self._record.get(key, default) # Change made here to switch None to default
        else:
            return None

If this is okay with you I can make the changes

@mdipierro
Copy link
Contributor

Yes. Please make the change. I will also change all the other getattr for uniformity.

@codecov-io
Copy link

Codecov Report

Merging #465 into master will increase coverage by 0.13%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #465      +/-   ##
==========================================
+ Coverage   69.43%   69.57%   +0.13%     
==========================================
  Files          69       67       -2     
  Lines        9253     9202      -51     
  Branches     2001     2000       -1     
==========================================
- Hits         6425     6402      -23     
+ Misses       2305     2297       -8     
+ Partials      523      503      -20

@mdipierro mdipierro merged commit acab330 into web2py:master Jun 20, 2017
willimoa added a commit to willimoa/pydal that referenced this pull request Jun 23, 2017
* commit '38066734f71f2cfe8688493ac8e08c6e654e16bc': (40 commits)
  experimantal code to address issue #1613
  Make DAL support jsonb for postgres (web2py#469)
  Fix get in pydal.helpers.classes Reference class calling __getattr__ … (web2py#465)
  testing py36 on appveyor (web2py#456)
  field.set_attributes(..) could return the instance (web2py#458)
  added missing "oracle" in adapters.register_for() (web2py#457)
  Releasing 17.03
  Updated changelog
  Cleaner solution for web2py#446
  Always find the driver on adapters
  added tests for py36
  Added locking for reconnect method switch, created a mixin for adapters that need reconnection mocking
  Correctly configure adapters that need connection for configuration
  Updated dev version
  Completely disable the pickling test on MSSQL (driver problem...)
  Disable part of pickling test on MSSQL, driver problem...
  Pass the list of field references when creating a subset of Rows object
  Fix storing Rows objects in pickle-based cache
  Fix perpetual migrations due to changes in name quoting
  Fix DAL(None).define_table()
  ...
valq7711 added a commit to valq7711/pydal that referenced this pull request Aug 26, 2017
* added codecov settings file

this should silence unnecessary messages from codecov. we can then
adjust settings going forward

* checkpoint

* possibly fixed the issue with id in import_from_csv

* fixed import_from_csv_file

* removed unwanted print

* another import fix

* more import debugging

* Enabled entity quoting as default also on DAL class (web2py#365)

* Enhancement/teradata lastrowid (web2py#363)

* Initial change to remove ESCAPE from teradata syntax

* Revert "Initial change to remove ESCAPE from teradata syntax"

This reverts commit 81489e9.

* Fix lastrowid error for Teradata adapter

* further update to teradata adapter

* Allow custom Rows classes (web2py#367)

* Added Rows.append and Rows.insert (web2py#366)

* [WIP] Indexes support (web2py#361)

* First implementation of web2py#152

* Returning True on index creation/drop

* Added where option on postgre create_index

* Added tests for indexes

* Added support for additional arguments to Table.create_index

* Better expansion in sql instructions for indexes, better errors for indexes

* Re-implemented _lastsql on DAL class (web2py#368)

* Fixed web2py#319 and web2py#333

* turn off codecov/changes report

hopefully :)

* Some fixes on StringIO usages with py3

* Better blobs handling with MongoDB and python3

* Added missing representation of 'password' fields on NoSQL adapters

* Updated mongoDB tests on py3 and blobs

* Updated changelog

* Releasing 16.06

* Added postgres3 adapters, put back multiple values type boolean parsing in base parser

* Removed postgres2 adapter from tests matrix since implicitly tested on postgres3

* Updated dev version

* Making connection and cursors fork-safe in multiprocess environments

* Fixing missing inheritance of additional fields expressions in dialects

* Releasing 16.06.09

* Updated dev version

* Added forced parsing of date and datetime fields in SQLite parser

* Added aggregation type detection test for fields

* Fix web2py#376

* Fixed web2py#377

* default quote_template for CommonDialect

* Enhance d13e82f

* Fix web2py#380

* Releasing 16.06.20

* Updated dev version

* fixes web2py#382

* Improving parsing performance (web2py#385)

* Fix web2py#383

* Releasing 16.06.28

* Updated dev version

* added rows.join('name',lambda ids: db.referenced.field.belongs(ids))

* remove test that depends on details of json serialization

* fixed removal order of new table in test

* yet simpler and smarter row.join

* fixed rows.join(...)

* one more improvement in join

* allow many2many in row.join

* ignore pool_size for sqlite

* better security

* enabled python3.5 on travis (web2py#393)

* fix py35 Field.__hash__(), close web2py#392 (web2py#394)

* added py35 to tox.ini

* Avoid to run travis tests on py35 and google

* fixes web2py#396

* Skip travis tests on python 3.3

* Releasing 16.07

* Updated dev version

* Fix web2py#399 - postgres adapter lastrowid() to use currval(seq) instead of lastval()

* reinstated self._last_insert, no need to remove working logic

* defied long in _compat

* merged pydal

* portalocker: removed pywin32 dep, added tests (web2py#401)

* Avoid upload errors on py3 if upload content is a bytes string

* Compat module cleaning

* Releasing 16.08

* Updated dev version

* MongoDB: testcase and fix for query(field==list:reference)

* Enhancement/teradata test (web2py#413)

* Initial change to remove ESCAPE from teradata syntax

* Revert "Initial change to remove ESCAPE from teradata syntax"

This reverts commit 81489e9.

* Initial teradata tests changes.  More to come

* first sql.py change, TestAddMethod now OK

* include teradata in setup

* Postgres fixes (web2py#414)

* Fixed postgres2 and postgres3 adapters inheritance, updated `PostgreMeta` to choose the right class depending on uri

* Fixed representation for lists on postgres2 and postgres3 adapters

* Fixed typo in PostgreDialectArrays

* Ensure strings in PostgreArrayRepresenter._listify_elements

* New test helper class DALtest that handles connection boilerplate (web2py#415)

* Enhancement/teradata test (web2py#418)

* Initial change to remove ESCAPE from teradata syntax

* Revert "Initial change to remove ESCAPE from teradata syntax"

This reverts commit 81489e9.

* TestBelongs for Teradata

* More Teradata test changes

* run the test.

* fix for opening files in py3 (web2py#420)

* fix for opening files in py3

fixes also web2py/web2py#1451

* fix for PY2 detection

* Releasing 16.09

* Updated dev version

* Enhancement/teradatatest (web2py#426)

* Initial change to remove ESCAPE from teradata syntax

* Revert "Initial change to remove ESCAPE from teradata syntax"

This reverts commit 81489e9.

* Skipping TestChainedJoinUnique for Teradata.

* Clean connection data on thread local on DAL.close (web2py#427)

* Releasing 16.11

* Updated dev version

* Joinable subselects (web2py#408)

* Minimal implementation of joinable subselects (work in progress)
* Generate subselects in Set.nested_select() instead of BaseAdapter._select()
* Add support for subselects to BaseAdapter._count()
* Prevent table name collisions when applying record versioning filters
* Fix common filters in select with subselects
* Add support for subselect fields to Rows.render() and fix bugs
* Refactor Google datastore adapter and BaseAdapter.get_table()
* Check for table name collisions when building a SELECT query
* When building subselect string, ignore cache if outer_scoped is not empty
* Minor optimization in SQLAdapter._select_wcols()
* Add parameter "correlated" to Select constructor defaults to True. When set to False, the subquery will be self-contained, meaning it will never reference any tables from the parent scope.
* Implement proper expansion of correlated subqueries
* Check that subquery in belongs() expression has exactly 1 column
* Implement expansion of correlated subqueries in count(), update(), delete()
* Update Mongo unit tests to new adapter API
* Move part of Set.nested_select() to adapter code
* Unit tests for the Select class
* Additional unit tests for fixed bugs
* Expand aliased table names using dialect methods
* Fix expansion of correlated subqueries used in UPDATE/DELETE statements

* Refactor table name attributes and fix related aliasing/rname bugs

* Update IMAP adapter methods to new API

* Add table alias support to UPDATE/DELETE in MSSQL dialect

* Store values for callbacks on insert/update/delete operations (web2py#431)

* Changed listify to store computations in values

* Moved attempt_upload logic to callbacks

* Fixed callbacks access to fields

* One more check that Table.with_alias() updates all field attributes

* Rename Table.sqlsafe and Table.sqlsafe_alias

* Refactor field name attributes and fix related rname bugs

* Fix type error in MSSQL TFK reference template

* Use the correct constraint name in MSSQL TFK references

* Added missing 'OpRow.get' method

* Fixed after_update callbacks argument in validate_and_update

* tablemap should contains all tables to avoid key errors in adapter _select_wcols

* Fix field migrations and some final refactoring

* Fixed wrong add operation with float types web2py#445

* Updated changelog

* Releasing 17.01

* Fix DAL(None).define_table()

* Fix perpetual migrations due to changes in name quoting

* Fix storing Rows objects in pickle-based cache

* Pass the list of field references when creating a subset of Rows object

* Disable part of pickling test on MSSQL, driver problem...

* Completely disable the pickling test on MSSQL (driver problem...)

* Updated dev version

* Correctly configure adapters that need connection for configuration

* Added locking for reconnect method switch, created a mixin for adapters that need reconnection mocking

* added tests for py36

* Always find the driver on adapters

* Cleaner solution for web2py#446

* Updated changelog

* Releasing 17.03

* added missing "oracle" in adapters.register_for() (web2py#457)

Fixes web2py/web2py#1599

* field.set_attributes(..) could return the instance (web2py#458)

Would let the code be  more straightforward -- example, when passing the "decorated" field to the function...
Now I have to   "scatter" the code in two places for each field...

* testing py36 on appveyor (web2py#456)

* Fix get in pydal.helpers.classes Reference class calling __getattr__ … (web2py#465)

* Fix get in pydal.helpers.classes Reference class calling __getattr__ with 3 variables instead of 2 as per signature

* Move fix of wrong method call in Reference class from get to __getattr__

* Make DAL support jsonb for postgres (web2py#469)

* Make DAL support jsonb for postgres

* added parser for jsonb

* experimantal code to address issue #1613

* fixed error introduced in recent refactoring by me

* mysql and postgres unix_socket support

* fixed _find_work_folder

* support for gcloud sql v2. thanks Karoly Kantor

* small typo in warnings

* Releasing 17.07

* fixed issue web2py#480

* Fixes web2py/web2py#1683 (web2py#484)

* allow DAL(..., adapter_args=dict(migrator=InDBMigrator))

* fixed custom migrator

* Updated dev version

* Cleaning up f71aade

* Fix Table objects in common fields (web2py#486)

This fixes the problem of putting and tables on common_fields and having lazy_define_table throw an exception because Table doesn't have a clone attribute.

* fixed typo changing `oracle_fix` to `cmd_fix` in adapters/oracle.py (web2py#471)

fixed error where %-formats were only applying to second part of concatenated SQL statement in dialects/oracle.py

* override _select_aux_execute method in adapters/oracle.py to use oracle-specific `fetchall` (web2py#473)

* fixed MSSQL TOP

* possible fix for tTIZLy33Yw8

* fixed del of missing key, thanks Lazaro Aulan

* Fixed st_asgeojson (web2py#489)

see https://groups.google.com/forum/#!topic/web2py/EixMPrPr9SY
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants