sequel 0.4.4.1 → 0.4.4.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 0.4.4.2 (2007-12-20)
+
+* Fixed parsing errors in Ruby 1.9.
+
+* Fixed sync problem in connection_pool_spec.
+
+* Changed String#to_time to raise Error::InvalidValue if Time.parse fails.
+
+* Refactored sequel error classes.
+
 === 0.4.4.1 (2007-12-19)
 
 * Fixed schema generation code to use fied quoting and support adapter-specific literalization of default values (#108).

data/Rakefile

@@ -1,159 +1,161 @@
-require 'rake'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'fileutils'
-include FileUtils
-
-NAME = "sequel"
-VERS = "0.4.4.1"
-CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
-RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
-  "--opname", "index.html",
-  "--line-numbers", 
-  "--main", "README",
-  "--inline-source"]
-
-desc "Packages up Sequel."
-task :default => [:package]
-task :package => [:clean]
-
-task :doc => [:rdoc]
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.options += RDOC_OPTS
-  rdoc.main = "README"
-  rdoc.title = "Sequel: Lightweight ORM library for Ruby"
-  rdoc.rdoc_files.add ['README', 'COPYING', 'lib/sequel.rb', 'lib/**/*.rb']
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERS
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
-  s.rdoc_options += RDOC_OPTS + 
-    ['--exclude', '^(examples|extras)\/', '--exclude', 'lib/sequel.rb']
-  s.summary = "Lightweight ORM library for Ruby"
-  s.description = s.summary
-  s.author = "Sharon Rosner"
-  s.email = 'ciconia@gmail.com'
-  s.homepage = 'http://sequel.rubyforge.org'
-  s.executables = ['sequel']
-
-  s.add_dependency('metaid')
-  s.add_dependency('ParseTree', '>= 2.0.0')
-  s.add_dependency('ruby2ruby')
-  
-  s.required_ruby_version = '>= 1.8.4'
-
-  s.files = %w(COPYING README Rakefile) + Dir.glob("{bin,doc,spec,lib}/**/*")
-      
-  s.require_path = "lib"
-  s.bindir = "bin"
-end
-
-win_spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERS
-  s.platform = Gem::Platform::WIN32
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
-  s.rdoc_options += RDOC_OPTS + 
-    ['--exclude', '^(examples|extras)\/', '--exclude', 'lib/sequel.rb']
-  s.summary = "Lightweight ORM library for Ruby"
-  s.description = s.summary
-  s.author = "Sharon Rosner"
-  s.email = 'ciconia@gmail.com'
-  s.homepage = 'http://sequel.rubyforge.org'
-  s.executables = ['sequel']
-
-  s.add_dependency('metaid')
-  
-  s.required_ruby_version = '>= 1.8.4'
-
-  s.files = %w(COPYING README Rakefile) + Dir.glob("{bin,doc,spec,lib}/**/*")
-      
-  s.require_path = "lib"
-  s.bindir = "bin"
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.need_tar = true
-  p.gem_spec = spec
-end
-
-Rake::GemPackageTask.new(win_spec) do |p|
-  p.need_tar = true
-  p.gem_spec = win_spec
-end
-
-task :install do
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
-end
-
-task :install_no_docs do
-  sh %{rake package}
-  sh %{sudo gem install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri}
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
-task :release => [:package] do
-  sh %{rubyforge login}
-  sh %{rubyforge add_release sequel sequel #{VERS} pkg/sequel-#{VERS}.tgz}
-  sh %{rubyforge add_file sequel sequel #{VERS} pkg/sequel-#{VERS}.gem}
-  sh %{rubyforge add_file sequel sequel #{VERS} pkg/sequel-#{VERS}-x86-mswin32-60.gem}
-end
-
-desc 'Update docs and upload to rubyforge.org'
-task :doc_rforge do
-  sh %{rake doc}
-  sh %{scp -r doc/rdoc/* ciconia@rubyforge.org:/var/www/gforge-projects/sequel}
-end
-
-require 'spec/rake/spectask'
-
-desc "Run specs with coverage"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-  t.rcov = true
-end
-
-desc "Run specs without coverage"
-Spec::Rake::SpecTask.new('spec_no_cov') do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
-end
-
-desc "Run adapter specs without coverage"
-Spec::Rake::SpecTask.new('spec_adapters') do |t|
-  t.spec_files = FileList['spec/adapters/*_spec.rb']
-end
-
-desc "Run all specs with coverage"
-Spec::Rake::SpecTask.new('spec_all') do |t|
-  t.spec_files = FileList['spec/*_spec.rb', 'spec/adapters/*_spec.rb']
-  t.rcov = true
-end
-
-##############################################################################
-# Statistics
-##############################################################################
-
-STATS_DIRECTORIES = [
-  %w(Code   lib/),
-  %w(Spec   spec/)
-].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  require 'extra/stats'
-  verbose = true
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
-
+require "rake"
+require "rake/clean"
+require "rake/gempackagetask"
+require "rake/rdoctask"
+require "fileutils"
+include FileUtils
+
+NAME = "sequel"
+VERS = "0.4.4.2"
+CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
+RDOC_OPTS = ["--quiet", "--title", "Sequel: Concise ORM for Ruby",
+  "--opname", "index.html",
+  "--line-numbers", 
+  "--main", "README",
+  "--inline-source"]
+
+desc "Packages up Sequel."
+task :default => [:package]
+task :package => [:clean]
+
+task :doc => [:rdoc]
+
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = "doc/rdoc"
+  rdoc.options += RDOC_OPTS
+  rdoc.main = "README"
+  rdoc.title = "Sequel: Lightweight ORM library for Ruby"
+  rdoc.rdoc_files.add ["README", "COPYING", "lib/sequel.rb", "lib/**/*.rb"]
+end
+
+spec = Gem::Specification.new do |s|
+  s.name = NAME
+  s.version = VERS
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
+  s.rdoc_options += RDOC_OPTS + 
+    ["--exclude", "^(examples|extras)\/", "--exclude", "lib/sequel.rb"]
+  s.summary = "Lightweight ORM library for Ruby"
+  s.description = s.summary
+  s.author = "Sharon Rosner"
+  s.email = "ciconia@gmail.com"
+  s.homepage = "http://sequel.rubyforge.org"
+  s.executables = ["sequel"]
+
+  s.add_dependency("metaid")
+  s.add_dependency("ParseTree", ">= 2.0.0")
+  s.add_dependency("ruby2ruby")
+  
+  s.required_ruby_version = ">= 1.8.4"
+
+  s.files = %w(COPYING README Rakefile) + Dir.glob("{bin,doc,spec,lib}/**/*")
+
+  s.require_path = "lib"
+  s.bindir = "bin"
+end
+
+win_spec = Gem::Specification.new do |s|
+  s.name = NAME
+  s.version = VERS
+  s.platform = Gem::Platform::WIN32
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
+  s.rdoc_options += RDOC_OPTS + 
+    ["--exclude", "^(examples|extras)\/", "--exclude", "lib/sequel.rb"]
+  s.summary = "Lightweight ORM library for Ruby"
+  s.description = s.summary
+  s.author = "Sharon Rosner"
+  s.email = "ciconia@gmail.com"
+  s.homepage = "http://sequel.rubyforge.org"
+  s.executables = ["sequel"]
+
+  s.add_dependency("metaid")
+  
+  s.required_ruby_version = ">= 1.8.4"
+
+  s.files = %w(COPYING README Rakefile) + Dir.glob("{bin,doc,spec,lib}/**/*")
+      
+  s.require_path = "lib"
+  s.bindir = "bin"
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.need_tar = true
+  p.gem_spec = spec
+end
+
+Rake::GemPackageTask.new(win_spec) do |p|
+  p.need_tar = true
+  p.gem_spec = win_spec
+end
+
+task :install do
+  sh %{rake package}
+  sh %{sudo gem install pkg/#{NAME}-#{VERS}}
+end
+
+task :install_no_docs do
+  sh %{rake package}
+  sh %{sudo gem install pkg/#{NAME}-#{VERS} --no-rdoc --no-ri}
+end
+
+task :uninstall => [:clean] do
+  sh %{sudo gem uninstall #{NAME}}
+end
+
+task :release => [:package] do
+  sh %{rubyforge login}
+  sh %{rubyforge add_release sequel sequel #{VERS} pkg/sequel-#{VERS}.tgz}
+  sh %{rubyforge add_file sequel sequel #{VERS} pkg/sequel-#{VERS}.gem}
+  sh %{rubyforge add_file sequel sequel #{VERS} pkg/sequel-#{VERS}-x86-mswin32-60.gem}
+end
+
+desc "Update docs and upload to rubyforge.org"
+task :doc_rforge do
+  sh %{rake doc}
+  sh %{scp -r doc/rdoc/* ciconia@rubyforge.org:/var/www/gforge-projects/sequel}
+end
+
+require "spec/rake/spectask"
+
+desc "Run specs with coverage"
+Spec::Rake::SpecTask.new("spec") do |t|
+  t.spec_files = FileList["spec/*_spec.rb"]
+  t.rcov_opts = ["--exclude", "gems", "--exclude", "spec"]
+  t.rcov = true
+end
+
+desc "Run specs without coverage"
+Spec::Rake::SpecTask.new("spec_no_cov") do |t|
+  t.spec_files = FileList["spec/*_spec.rb"]
+end
+
+desc "Run adapter specs without coverage"
+Spec::Rake::SpecTask.new("spec_adapters") do |t|
+  t.spec_files = FileList["spec/adapters/*_spec.rb"]
+end
+
+desc "Run all specs with coverage"
+Spec::Rake::SpecTask.new("spec_all") do |t|
+  t.spec_files = FileList["spec/*_spec.rb", "spec/adapters/*_spec.rb"]
+  t.rcov_opts = ["--exclude", "gems", "--exclude", "spec"]
+  t.rcov = true
+end
+
+##############################################################################
+# Statistics
+##############################################################################
+
+STATS_DIRECTORIES = [
+  %w(Code   lib/),
+  %w(Spec   spec/)
+].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
+
+desc "Report code statistics (KLOCs, etc) from the application"
+task :stats do
+  require "extra/stats"
+  verbose = true
+  CodeStatistics.new(*STATS_DIRECTORIES).to_s
+end
+

data/lib/sequel.rb

@@ -1,12 +1,12 @@
-require 'metaid'
-require 'bigdecimal'
-require 'bigdecimal/util'
+require "metaid"
+require "bigdecimal"
+require "bigdecimal/util"
 
 files = %w[
-  core_ext core_sql array_keys error connection_pool pretty_table
+  core_ext core_sql array_keys exceptions connection_pool pretty_table
   dataset migration model schema database worker
 ]
-dir = File.join(File.dirname(__FILE__), 'sequel')
+dir = File.join(File.dirname(__FILE__), "sequel")
 files.each {|f| require(File.join(dir, f))}
 
 module Sequel #:nodoc:
@@ -32,16 +32,20 @@ module Sequel #:nodoc:
     def method_missing(m, *args)
       c = Database.adapter_class(m)
       begin
+        # three ways to invoke this:
+        # 0 arguments: Sequel.dbi 
+        # 1 argument:  Sequel.dbi(db_name)
+        # more args:   Sequel.dbi(db_name, opts)
         case args.size
-        when 1: # Sequel.dbi(db_name)
-          opts = args[0].is_a?(Hash) ? args[0] : {:database => args[0]}
-        when 0 # Sequel.dbi
+        when 0
           opts = {}
-        else # Sequel.dbi(db_name, opts)
+        when 1
+          opts = args[0].is_a?(Hash) ? args[0] : {:database => args[0]}
+        else
           opts = args[1].merge(:database => args[0])
         end
       rescue
-        raise SequelError, "Invalid parameters specified"
+        raise Error, "Unknown adapter (#{m})"
       end
       c.new(opts)
     end

data/lib/sequel/adapters/adapter_skeleton.rb

@@ -28,7 +28,8 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Time: literal(v.iso8601)
+        when Time
+          literal(v.iso8601)
         else
           super
         end

data/lib/sequel/adapters/ado.rb

@@ -46,7 +46,8 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Time: literal(v.iso8601)
+        when Time
+          literal(v.iso8601)
         else
           super
         end

data/lib/sequel/adapters/db2.rb

@@ -14,9 +14,10 @@ module Sequel
       
       def check_error(rc, msg)
         case rc
-        when SQL_SUCCESS, SQL_SUCCESS_WITH_INFO: nil
+        when SQL_SUCCESS, SQL_SUCCESS_WITH_INFO
+          nil
         else
-          raise SequelError, msg
+          raise Error, msg
         end
       end
       
@@ -79,7 +80,8 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Time: literal(v.iso8601)
+        when Time
+          literal(v.iso8601)
         else
           super
         end

data/lib/sequel/adapters/dbi.rb

@@ -70,7 +70,8 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Time: literal(v.iso8601)
+        when Time
+          literal(v.iso8601)
         else
           super
         end

data/lib/sequel/adapters/informix.rb

@@ -39,7 +39,8 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Time: literal(v.iso8601)
+        when Time
+          literal(v.iso8601)
         else
           super
         end

data/lib/sequel/adapters/jdbc.rb

@@ -15,7 +15,7 @@ module Sequel
       
       def connect
         unless conn_string = @opts[:uri] || @opts[:url] || @opts[:database]
-          raise SequelError, "No connection string specified"
+          raise Error, "No connection string specified"
         end
         unless conn_string =~ /^jdbc:/
           conn_string = "jdbc:#{conn_string}"
@@ -65,7 +65,8 @@ module Sequel
     class Dataset < Sequel::Dataset
       def literal(v)
         case v
-        when Time: literal(v.iso8601)
+        when Time
+          literal(v.iso8601)
         else
           super
         end