activerecord 1.14.1 → 1.14.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+*1.14.2* (April 9th, 2005)
+
+* Fixed calculations for the Oracle Adapter (closes #4626) [Michael Schoen]
+
+
 *1.14.1* (April 6th, 2005)
 
 * Fix type_name_with_module to handle type names that begin with '::'. Closes #4614. [Nicholas Seckar]

data/{rakefile → Rakefile}

@@ -18,7 +18,7 @@ RUBY_FORGE_PROJECT = "activerecord"
 RUBY_FORGE_USER    = "webster132"
 
 PKG_FILES = FileList[
-    "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "[A-Z]*", "install.rb", "rakefile"
+    "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "[A-Z]*", "install.rb", "Rakefile"
 ].exclude(/\bCVS\b|~$/)
 
 
@@ -101,7 +101,7 @@ spec = Gem::Specification.new do |s|
   s.summary = "Implements the ActiveRecord pattern for ORM."
   s.description = %q{Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.}
 
-  s.files = [ "rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG" ]
+  s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG" ]
   dist_dirs.each do |dir|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
@@ -170,116 +170,12 @@ task :pdoc => [:rdoc] do
 end
 
 desc "Publish the release files to RubyForge."
-task :release => [:package] do
-  files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-  if RUBY_FORGE_PROJECT then
-    require 'net/http'
-    require 'open-uri'
-
-    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
-    project_data = open(project_uri) { |data| data.read }
-    group_id = project_data[/[?&]group_id=(\d+)/, 1]
-    raise "Couldn't get group id" unless group_id
-
-    # This echos password to shell which is a bit sucky
-    if ENV["RUBY_FORGE_PASSWORD"]
-      password = ENV["RUBY_FORGE_PASSWORD"]
-    else
-      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
-      password = STDIN.gets.chomp
-    end
-
-    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-      data = [
-        "login=1",
-        "form_loginname=#{RUBY_FORGE_USER}",
-        "form_pw=#{password}"
-      ].join("&")
-      http.post("/account/login.php", data)
-    end
+task :release => [ :package ] do
+  `rubyforge login`
 
-    cookie = login_response["set-cookie"]
-    raise "Login failed" unless cookie
-    headers = { "Cookie" => cookie }
-
-    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-    release_data = open(release_uri, headers) { |data| data.read }
-    package_id = release_data[/[?&]package_id=(\d+)/, 1]
-    raise "Couldn't get package id" unless package_id
-
-    first_file = true
-    release_id = ""
-
-    files.each do |filename|
-      basename  = File.basename(filename)
-      file_ext  = File.extname(filename)
-      file_data = File.open(filename, "rb") { |file| file.read }
-
-      puts "Releasing #{basename}..."
-
-      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
-        type_map = {
-          ".zip"    => "3000",
-          ".tgz"    => "3110",
-          ".gz"     => "3110",
-          ".gem"    => "1400"
-        }; type_map.default = "9999"
-        type = type_map[file_ext]
-        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-
-        query_hash = if first_file then
-          {
-            "group_id" => group_id,
-            "package_id" => package_id,
-            "release_name" => RELEASE_NAME,
-            "release_date" => release_date,
-            "type_id" => type,
-            "processor_id" => "8000", # Any
-            "release_notes" => "",
-            "release_changes" => "",
-            "preformatted" => "1",
-            "submit" => "1"
-          }
-        else
-          {
-            "group_id" => group_id,
-            "release_id" => release_id,
-            "package_id" => package_id,
-            "step2" => "1",
-            "type_id" => type,
-            "processor_id" => "8000", # Any
-            "submit" => "Add This File"
-          }
-        end
-
-        query = "?" + query_hash.map do |(name, value)|
-          [name, URI.encode(value)].join("=")
-        end.join("&")
-
-        data = [
-          "--" + boundary,
-          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-          "Content-Type: application/octet-stream",
-          "Content-Transfer-Encoding: binary",
-          "", file_data, ""
-          ].join("\x0D\x0A")
-
-        release_headers = headers.merge(
-          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
-        )
-
-        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
-        http.post(target + query, data, release_headers)
-      end
-
-      if first_file then
-        release_id = release_response.body[/release_id=(\d+)/, 1]
-        raise("Couldn't get release id") unless release_id
-      end
-
-      first_file = false
-    end
+  for ext in %w( gem )
+    release_command = "rubyforge add_release activerecord activerecord 'REL #{PKG_VERSION}' pkg/activerecord-#{PKG_VERSION}.#{ext}"
+    puts release_command
+    system(release_command)
   end
-end
+end

data/lib/active_record/calculations.rb

@@ -145,7 +145,7 @@ module ActiveRecord
       protected
         def construct_calculation_sql(aggregate, aggregate_alias, options) #:nodoc:
           scope = scope(:find)
-          sql  = ["SELECT #{aggregate} AS #{aggregate_alias}"]
+          sql  = "SELECT #{aggregate} AS #{aggregate_alias}"
           sql << ", #{options[:group_field]} AS #{options[:group_alias]}" if options[:group]
           sql << " FROM #{table_name} "
           add_joins!(sql, options, scope)
@@ -154,7 +154,7 @@ module ActiveRecord
           sql << " HAVING #{options[:having]}" if options[:group] && options[:having]
           sql << " ORDER BY #{options[:order]}" if options[:order]
           add_limit!(sql, options)
-          sql.join
+          sql
         end
 
         def execute_simple_calculation(operation, column_name, column, aggregate, aggregate_alias, options) #:nodoc:

data/lib/active_record/version.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 14
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activerecord
 version: !ruby/object:Gem::Version 
-  version: 1.14.1
-date: 2006-04-06 00:00:00 -05:00
+  version: 1.14.2
+date: 2006-04-09 00:00:00 -05:00
 summary: Implements the ActiveRecord pattern for ORM.
 require_paths: 
 - lib
@@ -28,7 +28,7 @@ cert_chain:
 authors: 
 - David Heinemeier Hansson
 files: 
-- rakefile
+- Rakefile
 - install.rb
 - README
 - RUNNING_UNIT_TESTS
@@ -196,9 +196,6 @@ files:
 - test/fixtures/developers_projects.yml
 - test/fixtures/entrant.rb
 - test/fixtures/entrants.yml
-- test/fixtures/fixture_database.sqlite
-- test/fixtures/fixture_database.sqlite3
-- test/fixtures/fixture_database_2.sqlite
 - test/fixtures/fk_test_has_fk.yml
 - test/fixtures/fk_test_has_pk.yml
 - test/fixtures/flowers.jpg