Resolve issue #534 #1318

Merged
merged 2 commits into from May 26, 2011

Conversation

Projects
None yet
2 participants
Contributor

TheEmpty commented May 26, 2011

Removes the restriction on primary key when joining in a habtm && test that it was properly removed

So I saw issue #534 and thought that it looked simple and gave it a try. Added a test to prove that it works fine without it. First commit pretty nervous that I just screwed everything up or something :P so anyway, hope I understood the ticket correctly and the code is satisfactory.

jonleighton added a commit that referenced this pull request May 26, 2011

@jonleighton jonleighton merged commit 09e431a into rails:master May 26, 2011

jake3030 pushed a commit to jake3030/rails that referenced this pull request Jun 28, 2011

Fixed method_missing for ActionMailer so it no longer matches methods…
… where deliver or create are not a suffix [#1318 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>

shwoodard added a commit to shwoodard/rails-1 that referenced this pull request Sep 19, 2011

Merge branch '3-1-stable' of github.com:rails/rails into 3-1-stable
* '3-1-stable' of github.com:rails/rails: (91 commits)
  Merge pull request #3049 from brainopia/fix_to_query_edge_case
  Bump AR-JDBC version. THis version is compatible with 3.1 and above
  Revert "Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested."
  Fixed Apache configuration for gzipped assets: FilesMatch and LocationMatch cannot be nested. (cherry picked from commit 5e2bf4d)
  Proper lines numbers for stack trace info
  Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
  cherry-pick #1318 into 3-1-stable
  Bumping up to 3.1.1.rc1
  Add some CHANGELOG missing stuff
  Allow asset tag helper methods to accept :digest => false option in order to completely avoid the digest generation.
  Add equivalent nginx configuration
  Fix typos and broken link on asset pipeline guide
  Merge pull request #3015 from guilleiguaran/clear-tmp-cache-on-precompile
  Merge pull request #3012 from guilleiguaran/3-1-1-changelogs
  Revert "Provide a way to access to assets without using the digest, useful for static files and emails"
  Merge pull request #3011 from guilleiguaran/disable-sprockets-server
  Provide a way to access to assets without using the digest, useful for static files and emails
  Merge pull request #2922 from wayneeseguin/master
  getting_started.textile: Fix typo and split up a sentence in section "Building a Multi-Model Form"
  getting_started.textile: Fix typos in section "Rendering a Partial Form"
  ...

kamipo added a commit to kamipo/rails that referenced this pull request Feb 12, 2017

Deprecate `supports_primary_key?`
`supports_primary_key?` was added to determine if `primary_key` is
implemented in the adapter in f060221. But we already use `primary_key`
without `supports_primary_key?` (207f266, 5f3cf42) and using
`supports_primary_key?` has been removed in #1318. This means that
`supports_primary_key?` is no longer used in the internal and Active
Record doesn't work without `primary_key` is implemented (all adapters
must implement `primary_key`).

jeremy added a commit that referenced this pull request Feb 13, 2017

Deprecate `supports_primary_key?`
`supports_primary_key?` was added to determine if `primary_key` is
implemented in the adapter in f060221. But we already use `primary_key`
without `supports_primary_key?` (207f266, 5f3cf42) and using
`supports_primary_key?` has been removed in #1318. This means that
`supports_primary_key?` is no longer used in the internal and Active
Record doesn't work without `primary_key` is implemented (all adapters
must implement `primary_key`).

Closes #27977
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment