github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-17 01:21:42 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,889 Commits 34 Branches 105 Tags
ccda96093a3bf3fb360f7c6d61bbbf341b2ae034
Commit Graph

58 Commits

Author SHA1 Message Date
Pratik Naik
39e1ac658e Merge docrails 2009-01-18 18:10:58 +00:00
Ken Collins
57d795bad4 Make sure any Fixnum returned by a DB sum is type cast to a Float before standard converstion to a BigDecimal [#8994 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-13 10:45:57 -06:00
Joshua Peek
335a315240 Add simple case when DB calculations returns 0 instead of 0.0 [#1346 state:resolved] 2008-11-10 14:16:43 -06:00
Ken Collins
a7f920f674 If average value from DB is 0, make sure to convert it to a 0.0 float before calling #to_d on it [#1346 state:resolved] 
Signed-off-by: Joshua Peek <josh@joshpeek.com>
 2008-11-07 20:39:06 -06:00
Pratik Naik
9599948fbc Ensure Model.sum and Model.avg typecast appropriately. [#1066 state:resolved] 
Model.sum delegates typecasting to the column being summed. If that's not feasible, returns a string.
Model.avg always returns big decimal.
 2008-10-04 20:13:44 +01:00
Michael Koziarski
7553a23c0a Remove AS for oracle compatibility 2008-10-03 21:35:01 +02:00
Michael Koziarski
07913788f9 Interpolation requires double quotes 2008-09-09 21:16:06 +02:00
Pratik Naik
6ef35461dc Merge docrails 2008-09-03 17:58:47 +01:00
Andrew White
db22c89543 Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code! 
[#501 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-28 12:07:15 -07:00
Tarmo Tänav
13671cc565 Alias included associations if needed when doing a count 
[#302 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
 2008-08-27 23:29:29 -07:00
Joshua Peek
8756dd75b2 Performance: reduce garbage created by ActiveRecord::Calculations#column_alias_for 2008-08-26 14:24:52 -05:00
Michalis Polakis
c7375d74d9 Alias subquery used in calculations, to provide better compatibility with databases such as MonetDB 
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Tom Ward <tom@popdog.net>
[#796 state:committed]
 2008-08-11 16:48:45 +02:00
Ben Munat
ddab9d7fdf Add :from option to calculations. [#397 state:resolved] 2008-06-11 18:07:57 -07:00
Pratik Naik
bd75a722a2 Ensure AR#sum result is typecasted properly 2008-06-02 20:41:11 +01:00
Jonathan Viney
4210d85a3f Ensure Associations#sum returns 0 when no rows are returned. [#295 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-06-02 12:50:44 +01:00
Pratik Naik
98dc582742 Merge docrails. 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-05-25 12:29:00 +01:00
Xavier Noria
64092de257 Improve documentation coverage and markup 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-05-02 14:45:23 +01:00
Frederick Cheung
55622e0bde Avoid adding two DISTINCT statements to queries in sqlite 2. 2008-04-21 11:47:15 +12:00
Rick Olson
78c2d9fc22 ActiveRecord::Base#sum defaults to 0 if no rows are returned. Closes #11550 [kamal] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9243 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-08 05:20:33 +00:00
Michael Koziarski
50538fb524 Don't double include DISTINCT when the user has already specified it. Closes #11502 [kenneth.kalmer] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9223 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-04-04 12:06:22 +00:00
David Heinemeier Hansson
9e4558671c Ensure that you can still do expressions in calculations (closes #11355) [nbugajski/cavelle] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9043 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-17 04:02:34 +00:00
Rick Olson
7750afc4c1 Ensure that ActiveRecord::Calculations disambiguates field names with the table name. Closes #11027 [cavalle] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9018 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-03-13 03:06:51 +00:00
Jeremy Kemper
5bbc461fcb Fix calculations on associations with custom :foreign_key. Closes #8117 [kamal, jack] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8778 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2008-02-02 04:28:42 +00:00
Jeremy Kemper
57c613a601 Ruby 1.9 compat: calculations don't assume array implementation of ordered hash. References #1689 [Frederick Cheung] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8494 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-27 11:18:30 +00:00
Marcel Molina
9661395d38 Remove references to nonexistent :joins documentation. Closes #10498 [tpope] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8381 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-13 19:51:44 +00:00
Marcel Molina
ee6b6073d5 Document how the :include option can be used in Calculations::calculate. Closes #7446 [adamwiggins, ultimoamore] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8306 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-12-05 20:51:03 +00:00
Marcel Molina
7143d80147 Smattering of grammatical fixes to documentation. Closes #10083 [BobSilva] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8113 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-11-08 03:37:16 +00:00
David Heinemeier Hansson
37adea6ff1 Address shortcomings of changeset [8054] [protocool] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8109 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-11-07 15:07:39 +00:00
Marcel Molina
94502623fb Standardize on using hyphens rather than colons to separate option names from their explanation in documentation. Replace + with tt tags. Closes #8732. [ryanb] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8106 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-11-06 23:33:40 +00:00
Michael Koziarski
8f74527282 Escape table names during calculation queries. [wesley.moxam, Koz] Closes #4593 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8061 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-10-31 05:58:09 +00:00
Jeremy Kemper
bef071dd0b Introduce finder :joins with associations. Same :include syntax but with inner rather than outer joins. Closes #10012. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8054 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-10-29 21:39:52 +00:00
Rick Olson
a413056407 Fix and properly document/test count(column_name) usage. Closes #8999 [lifofifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-07-17 20:16:35 +00:00
Rick Olson
872c5f4380 Remove deprecated count(conditions=nil, joins=nil) usage. Closes #8993 [lifofifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7189 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-07-16 20:26:10 +00:00
Jeremy Kemper
b05fc40b5d Calculations support non-numeric foreign keys. Closes #8154. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6919 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 03:26:51 +00:00
Jeremy Kemper
1f802968c5 Calculations: return nil average instead of 0 when there are no rows to average. Closes #8298. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 06:57:04 +00:00
Rick Olson
2a305949d7 documentation project patches, closes #7342, #7319, #7316, #7190 [jeremymcanally] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6470 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-03-27 14:04:06 +00:00
Jeremy Kemper
b6171e7105 SQLite: count(distinct) queries supported in >= 3.2.6, fix calculations workaround, remove count(distinct) query rewrite, cleanup test connection scripts. Closes #6544. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5426 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-05 02:01:31 +00:00
Jeremy Kemper
f0152fb610 Include caller of deprecated count method. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5204 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-29 07:48:16 +00:00
Jeremy Kemper
a0bf0195a5 Deprecation: count class method should be called with an options hash rather than two args for conditions and joins. Closes #6287. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-09-26 17:02:45 +00:00
David Heinemeier Hansson
4394e402b7 Fixed that count distinct should use the selected column even when using :include (closes #5251) [anna@wota.jp] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4417 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-06-03 21:19:36 +00:00
Rick Olson
325cb1269c Namespaced OrderedHash so the Rails implementation does not clash with any others. (fixes #4911) [Julian Tarkhanov] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4318 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-30 20:36:37 +00:00
Marcel Molina
0dc53a8f6f When grouping, use the appropriate option key. [Marcel Molina Jr.] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4297 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-28 01:12:18 +00:00
Marcel Molina
b2c0ddf033 Add support for FrontBase (http://www.frontbase.com/) with a new adapter thanks to the hard work of one Mike Laster. Closes #4093. [mlaster@metavillage.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4291 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-27 22:39:45 +00:00
Rick Olson
f106e2c5c8 Fix bug where calculations with long alias names return null. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4269 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-25 18:53:19 +00:00
Rick Olson
4251662c1a Allow all calculations to take the :include option, not just COUNT (closes #4840) [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4264 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-25 05:25:04 +00:00
Rick Olson
df7b74668e Fix the HasManyAssociation#count method so it uses the new ActiveRecord::Base#count syntax, while maintaining backwards compatibility. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-19 21:37:54 +00:00
Rick Olson
32f66f09db Modify ActiveRecord::Base.count so it shares the same signature as #calculate, but maintains backwards compatibility. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4211 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-14 14:14:19 +00:00
Rick Olson
9466211d42 fix calculations for the Oracle Adapter (closes #4626) [Michael Schoen] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4192 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-06 20:10:44 +00:00
Rick Olson
52d298a8bd Enable Limit/Offset in Calculations (closes #4558) [lmarlow@yahoo.com] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4185 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-04-06 15:23:56 +00:00
David Heinemeier Hansson
fed7d334f2 Fixed documentation 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-03-28 03:06:40 +00:00