{"action":"created","comment":{"url":"https://api.github.com/repos/dgilland/alchy/pulls/comments/26528730","id":26528730,"diff_hunk":"@@ -92,12 +92,12 @@ def get_mapper_class(model, field):\n     return mapper_class(getattr(model, field))\n \n \n-def merge_declarative_args(base_classes, config_key):\n+def merge_local_declarative_args(cls, config_key):","path":"alchy/utils.py","position":5,"original_position":5,"commit_id":"8817eb8336ecd4e0d05c8f8fbc9f4819cf9c713d","original_commit_id":"edbecc1dbb3c71037955edbd3d5edf6681af29c1","user":{"login":"seth-p","id":7441788,"avatar_url":"https://avatars.githubusercontent.com/u/7441788?v=3","gravatar_id":"","url":"https://api.github.com/users/seth-p","html_url":"https://github.com/seth-p","followers_url":"https://api.github.com/users/seth-p/followers","following_url":"https://api.github.com/users/seth-p/following{/other_user}","gists_url":"https://api.github.com/users/seth-p/gists{/gist_id}","starred_url":"https://api.github.com/users/seth-p/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seth-p/subscriptions","organizations_url":"https://api.github.com/users/seth-p/orgs","repos_url":"https://api.github.com/users/seth-p/repos","events_url":"https://api.github.com/users/seth-p/events{/privacy}","received_events_url":"https://api.github.com/users/seth-p/received_events","type":"User","site_admin":false},"body":"Fair enough.","created_at":"2015-03-16T21:19:39Z","updated_at":"2015-03-16T21:19:39Z","html_url":"https://github.com/dgilland/alchy/pull/16#discussion_r26528730","pull_request_url":"https://api.github.com/repos/dgilland/alchy/pulls/16","_links":{"self":{"href":"https://api.github.com/repos/dgilland/alchy/pulls/comments/26528730"},"html":{"href":"https://github.com/dgilland/alchy/pull/16#discussion_r26528730"},"pull_request":{"href":"https://api.github.com/repos/dgilland/alchy/pulls/16"}}},"pull_request":{"url":"https://api.github.com/repos/dgilland/alchy/pulls/16","id":31282649,"html_url":"https://github.com/dgilland/alchy/pull/16","diff_url":"https://github.com/dgilland/alchy/pull/16.diff","patch_url":"https://github.com/dgilland/alchy/pull/16.patch","issue_url":"https://api.github.com/repos/dgilland/alchy/issues/16","number":16,"state":"open","locked":false,"title":"Fixed handling of __table_args__ and __mapper_args__.","user":{"login":"seth-p","id":7441788,"avatar_url":"https://avatars.githubusercontent.com/u/7441788?v=3","gravatar_id":"","url":"https://api.github.com/users/seth-p","html_url":"https://github.com/seth-p","followers_url":"https://api.github.com/users/seth-p/followers","following_url":"https://api.github.com/users/seth-p/following{/other_user}","gists_url":"https://api.github.com/users/seth-p/gists{/gist_id}","starred_url":"https://api.github.com/users/seth-p/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seth-p/subscriptions","organizations_url":"https://api.github.com/users/seth-p/orgs","repos_url":"https://api.github.com/users/seth-p/repos","events_url":"https://api.github.com/users/seth-p/events{/privacy}","received_events_url":"https://api.github.com/users/seth-p/received_events","type":"User","site_admin":false},"body":"I changed slightly the way ``ModelBase.__table_args__`` and ``ModelBase.__mapper_args__`` work. Previously, when invoked for a (derived) class ``cls``, they would merge ``base.__{table/mapper}_args__`` from ``cls.__bases__`` with ``cls.__local_{table/mapper}_args__``. The problem with this is that if any intermediate subclass of ``ModelBase`` (or any mixin that is inherited by ``cls`` ahead of ``ModelBase``) sets ``__{table/mapper}_args__`` , then the ``ModelBase.__{table/mapper}_args__`` won't be invoked at all, so no merging will happen. The new behavior is to merge ``base.__local_{table/mapper}_args__`` from all ``cls.__mro__``. This way ``ModelBase.__{table/mapper}_args__`` is never overridden, so the merging can always happen.","created_at":"2015-03-16T20:45:07Z","updated_at":"2015-03-16T21:19:39Z","closed_at":null,"merged_at":null,"merge_commit_sha":"0b0cbdf62d4b5c4aaf1039dfc4344bf2ac4997a4","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/dgilland/alchy/pulls/16/commits","review_comments_url":"https://api.github.com/repos/dgilland/alchy/pulls/16/comments","review_comment_url":"https://api.github.com/repos/dgilland/alchy/pulls/comments{/number}","comments_url":"https://api.github.com/repos/dgilland/alchy/issues/16/comments","statuses_url":"https://api.github.com/repos/dgilland/alchy/statuses/8817eb8336ecd4e0d05c8f8fbc9f4819cf9c713d","head":{"label":"seth-p:local_declarative_args","ref":"local_declarative_args","sha":"8817eb8336ecd4e0d05c8f8fbc9f4819cf9c713d","user":{"login":"seth-p","id":7441788,"avatar_url":"https://avatars.githubusercontent.com/u/7441788?v=3","gravatar_id":"","url":"https://api.github.com/users/seth-p","html_url":"https://github.com/seth-p","followers_url":"https://api.github.com/users/seth-p/followers","following_url":"https://api.github.com/users/seth-p/following{/other_user}","gists_url":"https://api.github.com/users/seth-p/gists{/gist_id}","starred_url":"https://api.github.com/users/seth-p/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seth-p/subscriptions","organizations_url":"https://api.github.com/users/seth-p/orgs","repos_url":"https://api.github.com/users/seth-p/repos","events_url":"https://api.github.com/users/seth-p/events{/privacy}","received_events_url":"https://api.github.com/users/seth-p/received_events","type":"User","site_admin":false},"repo":{"id":25640445,"name":"alchy","full_name":"seth-p/alchy","owner":{"login":"seth-p","id":7441788,"avatar_url":"https://avatars.githubusercontent.com/u/7441788?v=3","gravatar_id":"","url":"https://api.github.com/users/seth-p","html_url":"https://github.com/seth-p","followers_url":"https://api.github.com/users/seth-p/followers","following_url":"https://api.github.com/users/seth-p/following{/other_user}","gists_url":"https://api.github.com/users/seth-p/gists{/gist_id}","starred_url":"https://api.github.com/users/seth-p/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/seth-p/subscriptions","organizations_url":"https://api.github.com/users/seth-p/orgs","repos_url":"https://api.github.com/users/seth-p/repos","events_url":"https://api.github.com/users/seth-p/events{/privacy}","received_events_url":"https://api.github.com/users/seth-p/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/seth-p/alchy","description":"The declarative companion to SQLAlchemy","fork":true,"url":"https://api.github.com/repos/seth-p/alchy","forks_url":"https://api.github.com/repos/seth-p/alchy/forks","keys_url":"https://api.github.com/repos/seth-p/alchy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/seth-p/alchy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/seth-p/alchy/teams","hooks_url":"https://api.github.com/repos/seth-p/alchy/hooks","issue_events_url":"https://api.github.com/repos/seth-p/alchy/issues/events{/number}","events_url":"https://api.github.com/repos/seth-p/alchy/events","assignees_url":"https://api.github.com/repos/seth-p/alchy/assignees{/user}","branches_url":"https://api.github.com/repos/seth-p/alchy/branches{/branch}","tags_url":"https://api.github.com/repos/seth-p/alchy/tags","blobs_url":"https://api.github.com/repos/seth-p/alchy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/seth-p/alchy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/seth-p/alchy/git/refs{/sha}","trees_url":"https://api.github.com/repos/seth-p/alchy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/seth-p/alchy/statuses/{sha}","languages_url":"https://api.github.com/repos/seth-p/alchy/languages","stargazers_url":"https://api.github.com/repos/seth-p/alchy/stargazers","contributors_url":"https://api.github.com/repos/seth-p/alchy/contributors","subscribers_url":"https://api.github.com/repos/seth-p/alchy/subscribers","subscription_url":"https://api.github.com/repos/seth-p/alchy/subscription","commits_url":"https://api.github.com/repos/seth-p/alchy/commits{/sha}","git_commits_url":"https://api.github.com/repos/seth-p/alchy/git/commits{/sha}","comments_url":"https://api.github.com/repos/seth-p/alchy/comments{/number}","issue_comment_url":"https://api.github.com/repos/seth-p/alchy/issues/comments{/number}","contents_url":"https://api.github.com/repos/seth-p/alchy/contents/{+path}","compare_url":"https://api.github.com/repos/seth-p/alchy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/seth-p/alchy/merges","archive_url":"https://api.github.com/repos/seth-p/alchy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/seth-p/alchy/downloads","issues_url":"https://api.github.com/repos/seth-p/alchy/issues{/number}","pulls_url":"https://api.github.com/repos/seth-p/alchy/pulls{/number}","milestones_url":"https://api.github.com/repos/seth-p/alchy/milestones{/number}","notifications_url":"https://api.github.com/repos/seth-p/alchy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/seth-p/alchy/labels{/name}","releases_url":"https://api.github.com/repos/seth-p/alchy/releases{/id}","created_at":"2014-10-23T14:12:58Z","updated_at":"2015-03-11T22:34:27Z","pushed_at":"2015-03-16T21:11:26Z","git_url":"git://github.com/seth-p/alchy.git","ssh_url":"git@github.com:seth-p/alchy.git","clone_url":"https://github.com/seth-p/alchy.git","svn_url":"https://github.com/seth-p/alchy","homepage":"http://alchy.readthedocs.org","size":513,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"dgilland:develop","ref":"develop","sha":"317963b52bc44855955999ff6ed1ee54b89b4224","user":{"login":"dgilland","id":1251349,"avatar_url":"https://avatars.githubusercontent.com/u/1251349?v=3","gravatar_id":"","url":"https://api.github.com/users/dgilland","html_url":"https://github.com/dgilland","followers_url":"https://api.github.com/users/dgilland/followers","following_url":"https://api.github.com/users/dgilland/following{/other_user}","gists_url":"https://api.github.com/users/dgilland/gists{/gist_id}","starred_url":"https://api.github.com/users/dgilland/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dgilland/subscriptions","organizations_url":"https://api.github.com/users/dgilland/orgs","repos_url":"https://api.github.com/users/dgilland/repos","events_url":"https://api.github.com/users/dgilland/events{/privacy}","received_events_url":"https://api.github.com/users/dgilland/received_events","type":"User","site_admin":false},"repo":{"id":16425613,"name":"alchy","full_name":"dgilland/alchy","owner":{"login":"dgilland","id":1251349,"avatar_url":"https://avatars.githubusercontent.com/u/1251349?v=3","gravatar_id":"","url":"https://api.github.com/users/dgilland","html_url":"https://github.com/dgilland","followers_url":"https://api.github.com/users/dgilland/followers","following_url":"https://api.github.com/users/dgilland/following{/other_user}","gists_url":"https://api.github.com/users/dgilland/gists{/gist_id}","starred_url":"https://api.github.com/users/dgilland/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dgilland/subscriptions","organizations_url":"https://api.github.com/users/dgilland/orgs","repos_url":"https://api.github.com/users/dgilland/repos","events_url":"https://api.github.com/users/dgilland/events{/privacy}","received_events_url":"https://api.github.com/users/dgilland/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/dgilland/alchy","description":"The declarative companion to SQLAlchemy","fork":false,"url":"https://api.github.com/repos/dgilland/alchy","forks_url":"https://api.github.com/repos/dgilland/alchy/forks","keys_url":"https://api.github.com/repos/dgilland/alchy/keys{/key_id}","collaborators_url":"https://api.github.com/repos/dgilland/alchy/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/dgilland/alchy/teams","hooks_url":"https://api.github.com/repos/dgilland/alchy/hooks","issue_events_url":"https://api.github.com/repos/dgilland/alchy/issues/events{/number}","events_url":"https://api.github.com/repos/dgilland/alchy/events","assignees_url":"https://api.github.com/repos/dgilland/alchy/assignees{/user}","branches_url":"https://api.github.com/repos/dgilland/alchy/branches{/branch}","tags_url":"https://api.github.com/repos/dgilland/alchy/tags","blobs_url":"https://api.github.com/repos/dgilland/alchy/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/dgilland/alchy/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/dgilland/alchy/git/refs{/sha}","trees_url":"https://api.github.com/repos/dgilland/alchy/git/trees{/sha}","statuses_url":"https://api.github.com/repos/dgilland/alchy/statuses/{sha}","languages_url":"https://api.github.com/repos/dgilland/alchy/languages","stargazers_url":"https://api.github.com/repos/dgilland/alchy/stargazers","contributors_url":"https://api.github.com/repos/dgilland/alchy/contributors","subscribers_url":"https://api.github.com/repos/dgilland/alchy/subscribers","subscription_url":"https://api.github.com/repos/dgilland/alchy/subscription","commits_url":"https://api.github.com/repos/dgilland/alchy/commits{/sha}","git_commits_url":"https://api.github.com/repos/dgilland/alchy/git/commits{/sha}","comments_url":"https://api.github.com/repos/dgilland/alchy/comments{/number}","issue_comment_url":"https://api.github.com/repos/dgilland/alchy/issues/comments{/number}","contents_url":"https://api.github.com/repos/dgilland/alchy/contents/{+path}","compare_url":"https://api.github.com/repos/dgilland/alchy/compare/{base}...{head}","merges_url":"https://api.github.com/repos/dgilland/alchy/merges","archive_url":"https://api.github.com/repos/dgilland/alchy/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/dgilland/alchy/downloads","issues_url":"https://api.github.com/repos/dgilland/alchy/issues{/number}","pulls_url":"https://api.github.com/repos/dgilland/alchy/pulls{/number}","milestones_url":"https://api.github.com/repos/dgilland/alchy/milestones{/number}","notifications_url":"https://api.github.com/repos/dgilland/alchy/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/dgilland/alchy/labels{/name}","releases_url":"https://api.github.com/repos/dgilland/alchy/releases{/id}","created_at":"2014-02-01T01:11:56Z","updated_at":"2015-03-11T22:16:27Z","pushed_at":"2015-03-11T22:16:26Z","git_url":"git://github.com/dgilland/alchy.git","ssh_url":"git@github.com:dgilland/alchy.git","clone_url":"https://github.com/dgilland/alchy.git","svn_url":"https://github.com/dgilland/alchy","homepage":"http://alchy.readthedocs.org","size":1122,"stargazers_count":31,"watchers_count":31,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":4,"mirror_url":null,"open_issues_count":2,"forks":4,"open_issues":2,"watchers":31,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/dgilland/alchy/pulls/16"},"html":{"href":"https://github.com/dgilland/alchy/pull/16"},"issue":{"href":"https://api.github.com/repos/dgilland/alchy/issues/16"},"comments":{"href":"https://api.github.com/repos/dgilland/alchy/issues/16/comments"},"review_comments":{"href":"https://api.github.com/repos/dgilland/alchy/pulls/16/comments"},"review_comment":{"href":"https://api.github.com/repos/dgilland/alchy/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/dgilland/alchy/pulls/16/commits"},"statuses":{"href":"https://api.github.com/repos/dgilland/alchy/statuses/8817eb8336ecd4e0d05c8f8fbc9f4819cf9c713d"}}}}