sequel_core 1.2.1 → 1.3

data/CHANGELOG

@@ -1,3 +1,29 @@
+=== 1.3 (2008-03-08)
+
+* Added configuration file for running specs (#186).
+
+* Changed Database#drop_index to accept fixed arity (#173).
+
+* Changed column definition sql to put UNSIGNED constraint before unique in order to satisfy MySQL (#171).
+
+* Enhanced MySQL adapter to support load data local infile_, added compress option for mysql connection by default (#172).
+
+* Fixed bug when inserting hashes in array tuples mode.
+
+* Changed SQLite adapter to catch RuntimeError raised when executing a statement and raise an Error::InvalidStatement with the offending SQL and error message (#188).
+
+* Added Error::InvalidStatement class.
+
+* Fixed Dataset#reverse to not raise for unordered dataset (#189).
+
+* Added Dataset#unordered method and changed #order to remove order if nil is specified (#190).
+
+* Fixed reversing order of ASC expression (#164).
+
+* Added support for :null => true option when defining table columns (#192).
+
+* Fixed Symbol#method_missing to accept variable arity (#185).
+
 === 1.2.1 (2008-02-29)
 
 * Added add_constraint and drop_constraint functionality to Database#alter_table (#182).

data/README

@@ -1,6 +1,6 @@
-== Sequel: Concise ORM for Ruby
+== Sequel: The Database Toolkit for Ruby
 
-Sequel is an ORM framework for Ruby. Sequel provides thread safety, connection pooling, and a concise DSL for constructing queries and table schemas.
+Sequel is a database access toolkit for Ruby. Sequel provides thread safety, connection pooling, and a concise DSL for constructing queries and table schemas.
 
 Sequel makes it easy to deal with multiple records without having to break your teeth on SQL.
 
@@ -24,10 +24,6 @@ If you have any comments or suggestions please send an email to ciconia at gmail
 
   sudo gem install sequel
   
-Note: as of version 0.5, Sequel models are distributed in a separate gem. In order to use sequel models, you should install the sequel_model gem:
-
-  sudo gem install sequel_model
-  
 == Supported Databases
 
 Sequel currently supports:
@@ -53,7 +49,7 @@ You get an IRB session with the database object stored in DB.
 
 == An Introduction
 
-Sequel was designed to take the hassle away from connecting to databases and manipulating them. Sequel deals with all the boring stuff like maintaining connections, formatting SQL correctly and fetching records so you can concentrate on your application.
+Sequel is designed to take the hassle away from connecting to databases and manipulating them. Sequel deals with all the boring stuff like maintaining connections, formatting SQL correctly and fetching records so you can concentrate on your application.
 
 Sequel uses the concept of datasets to retrieve data. A Dataset object encapsulates an SQL query and supports chainability, letting you fetch data using a convenient Ruby DSL that is both concise and infinitely flexible.
 
@@ -78,4 +74,178 @@ Or getting results as a transposed hash, with one column as key and another as v
 
   middle_east.to_hash(:name, :area) #=> {'Israel' => 20000, 'Greece' => 120000, ...}
 
-You can find more information on getting started with Sequel {here}[http://code.google.com/p/ruby-sequel/wiki/GettingStarted]
+Much of Sequel is still undocumented (especially the part relating to model classes). The following section provides examples of common usage. Feel free to explore...
+
+== Getting Started
+
+=== Connecting to a database
+
+To connect to a database you simply provide Sequel with a URL:
+
+  require 'sequel'
+  DB = Sequel.open 'sqlite:///blog.db'
+  
+The connection URL can also include such stuff as the user name and password:
+
+  DB = Sequel.open 'postgres://cico:12345@localhost:5432/mydb'
+
+You can also specify optional parameters, such as the connection pool size, or a logger for logging SQL queries:
+
+  DB = Sequel.open("postgres://postgres:postgres@localhost/my_db",
+    :max_connections => 10, :logger => Logger.new('log/db.log'))
+
+=== Arbitrary SQL queries
+
+  DB.execute("create table t (a text, b text)")
+  DB.execute("insert into t values ('a', 'b')")
+
+Or more succinctly:
+
+  DB << "create table t (a text, b text)"
+  DB << "insert into t values ('a', 'b')"
+
+=== Getting Dataset Instances
+
+Dataset is the primary means through which records are retrieved and manipulated. You can create an blank dataset by using the dataset method:
+
+  dataset = DB.dataset
+
+Or by using the from methods:
+
+  posts = DB.from(:posts)
+
+You can also use the equivalent shorthand:
+
+  posts = DB[:posts]
+
+Note: the dataset will only fetch records when you explicitly ask for them, as will be shown below. Datasets can be manipulated to filter through records, change record order and even join tables, as will also be shown below.
+
+=== Retrieving Records
+
+You can retrieve records by using the all method:
+
+  posts.all
+
+The all method returns an array of hashes, where each hash corresponds to a record.
+
+You can also iterate through records one at a time:
+
+  posts.each {|row| p row}
+
+Or perform more advanced stuff:
+
+  posts.map(:id)
+  posts.inject({}) {|h, r| h[r[:id]] = r[:name]}
+  
+You can also retrieve the first record in a dataset:
+
+  posts.first
+  
+Or retrieve a single record with a specific value:
+
+  posts[:id => 1]
+  
+If the dataset is ordered, you can also ask for the last record:
+
+  posts.order(:stamp).last
+  
+=== Filtering Records
+
+The simplest way to filter records is to provide a hash of values to match:
+
+  my_posts = posts.filter(:category => 'ruby', :author => 'david')
+  
+You can also specify ranges:
+
+  my_posts = posts.filter(:stamp => (2.weeks.ago)..(1.week.ago))
+  
+Or lists of values:
+
+  my_posts = posts.filter(:category => ['ruby', 'postgres', 'linux'])
+  
+Sequel now also accepts expressions as closures, AKA block filters:
+
+  my_posts = posts.filter {:category == ['ruby', 'postgres', 'linux']}
+  
+Which also lets you do stuff like:
+
+  my_posts = posts.filter {:stamp > 1.month.ago}
+  
+Some adapters (like postgresql) will also let you specify Regexps:
+
+  my_posts = posts.filter(:category => /ruby/i)
+  
+You can also use an inverse filter:
+
+  my_posts = posts.exclude(:category => /ruby/i)
+
+You can then retrieve the records by using any of the retrieval methods:
+
+  my_posts.each {|row| p row}
+  
+You can also specify a custom WHERE clause:
+
+  posts.filter('(stamp < ?) AND (author <> ?)', 3.days.ago, author_name)
+
+Datasets can also be used as subqueries:
+
+  DB[:items].filter('price > ?', DB[:items].select('AVG(price) + 100'))
+
+=== Summarizing Records
+
+Counting records is easy:
+  posts.filter(:category => /ruby/i).count
+
+And you can also query maximum/minimum values:
+  max_value = DB[:history].max(:value)
+  
+Or calculate a sum:
+  total = DB[:items].sum(:price)
+  
+=== Ordering Records
+
+  posts.order(:stamp)
+  
+You can also specify descending order
+
+  posts.order(:stamp.DESC)
+
+=== Deleting Records
+
+  posts.filter('stamp < ?', 3.days.ago).delete
+  
+=== Inserting Records
+
+  posts.insert(:category => 'ruby', :author => 'david')
+  
+Or alternatively:
+
+  posts << {:category => 'ruby', :author => 'david'}
+  
+=== Updating Records
+
+  posts.filter('stamp < ?', 3.days.ago).update(:state => 'archived')
+
+=== Joining Tables
+
+Joining is very useful in a variety of scenarios, for example many-to-many relationships. With Sequel it's really easy:
+
+  order_items = DB[:items].join(:order_items, :item_id => :id).
+    filter(:order_items__order_id => 1234)
+  
+This is equivalent to the SQL:
+
+  SELECT * FROM items LEFT OUTER JOIN order_items
+  ON order_items.item_id = items.id 
+  WHERE order_items.order_id = 1234
+
+You can then do anything you like with the dataset:
+
+  order_total = order_items.sum(:price)
+  
+Which is equivalent to the SQL:
+
+  SELECT sum(price) FROM items LEFT OUTER JOIN order_items
+  ON order_items.item_id = items.id
+  WHERE order_items.order_id = 1234
+  

data/Rakefile

@@ -9,11 +9,11 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.2.1"
+VERS = "1.3"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 
-  "--title", "Sequel: Database access for Ruby",
+  "--title", "Sequel: The Database Toolkit for Ruby",
   "--opname", "index.html",
   "--line-numbers", 
   "--main", "README",
@@ -29,7 +29,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = "doc/rdoc"
   rdoc.options += RDOC_OPTS
   rdoc.main = "README"
-  rdoc.title = "Sequel: Database access for Ruby"
+  rdoc.title = "Sequel: The Database Toolkit for Ruby"
   rdoc.rdoc_files.add ["README", "COPYING", "lib/sequel_core.rb", "lib/**/*.rb"]
 end
 
@@ -49,7 +49,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
   s.rdoc_options += RDOC_OPTS + 
     ["--exclude", "^(examples|extras)\/", "--exclude", "lib/sequel_core.rb"]
-  s.summary = "Database access for Ruby"
+  s.summary = "The Database Toolkit for Ruby"
   s.description = s.summary
   s.author = "Sharon Rosner"
   s.email = "ciconia@gmail.com"

data/bin/sequel

@@ -12,7 +12,7 @@ $logfile = nil
 $echo = nil
 
 opts = OptionParser.new do |opts|
-  opts.banner = "Sequel: Lightweight ORM for Ruby"
+  opts.banner = "Sequel: The Database Toolkit for Ruby"
   opts.define_head "Usage: sequel <uri> [options]"
   opts.separator ""
   opts.separator "Examples:"

data/lib/sequel_core/adapters/mysql.rb

@@ -86,14 +86,18 @@ module Sequel
       end
 
       def connect
-        conn = Mysql.real_connect(
+        conn = Mysql.init
+        conn.options(Mysql::OPT_LOCAL_INFILE, "client")
+        conn.real_connect(
           @opts[:host] || 'localhost',
           @opts[:user],
           @opts[:password],
           @opts[:database],
           @opts[:port],
           @opts[:socket],
-          Mysql::CLIENT_MULTI_RESULTS
+          Mysql::CLIENT_MULTI_RESULTS +
+          Mysql::CLIENT_MULTI_STATEMENTS +
+          Mysql::CLIENT_COMPRESS
         )
         conn.query_with_result = false
         if encoding = @opts[:encoding] || @opts[:charset]
@@ -159,9 +163,10 @@ module Sequel
         column[:size] ||= 255 if column[:type] == :varchar
         elements = column[:size] || column[:elements]
         sql << "(#{literal(elements)})" if elements
+        sql << UNSIGNED if column[:unsigned]
         sql << UNIQUE if column[:unique]
         sql << NOT_NULL if column[:null] == false
-        sql << UNSIGNED if column[:unsigned]
+        sql << NULL if column[:null] == true
         sql << " DEFAULT #{literal(column[:default])}" if column.include?(:default)
         sql << PRIMARY_KEY if column[:primary_key]
         sql << " #{auto_increment_sql}" if column[:auto_increment]
@@ -341,6 +346,12 @@ module Sequel
           "REPLACE INTO #{@opts[:from]} DEFAULT VALUES"
         else
           values = values[0] if values.size == 1
+          
+          # if hash or array with keys we need to transform the values
+          if @transform && (values.is_a?(Hash) || (values.is_a?(Array) && values.keys))
+            values = transform_save(values)
+          end
+
           case values
           when Sequel::Model
             insert_sql(values.values)
@@ -349,14 +360,12 @@ module Sequel
               "REPLACE INTO #{@opts[:from]} DEFAULT VALUES"
             elsif values.keys
               fl = values.keys.map {|f| literal(f.is_a?(String) ? f.to_sym : f)}
-              vl = @transform ? transform_save(values.values) : values.values
-              vl.map! {|v| literal(v)}
+              vl = values.values.map {|v| literal(v)}
               "REPLACE INTO #{@opts[:from]} (#{fl.join(COMMA_SEPARATOR)}) VALUES (#{vl.join(COMMA_SEPARATOR)})"
             else
               "REPLACE INTO #{@opts[:from]} VALUES (#{literal(values)})"
             end
           when Hash
-            values = transform_save(values) if @transform
             if values.empty?
               "REPLACE INTO #{@opts[:from]} DEFAULT VALUES"
             else
@@ -419,6 +428,23 @@ module Sequel
         self
       end
       
+      def array_tuples_transform_load(r)
+        a = []; a.keys = []
+        r.each_pair do |k, v|
+          a[k] = (tt = @transform[k]) ? tt[0][v] : v
+        end
+        a
+      end
+
+      # Applies the value transform for data saved to the database.
+      def array_tuples_transform_save(r)
+        a = []; a.keys = []
+        r.each_pair do |k, v|
+          a[k] = (tt = @transform[k]) ? tt[1][v] : v
+        end
+        a
+      end
+
       def multi_insert_sql(columns, values)
         columns = literal(columns)
         values = values.map {|r| "(#{literal(r)})"}.join(COMMA_SEPARATOR)

data/lib/sequel_core/adapters/sqlite.rb

@@ -39,21 +39,29 @@ module Sequel
       def execute(sql)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute_batch(sql); conn.changes}
+      rescue RuntimeError => e
+        raise Error::InvalidStatement, "#{sql}\r\n#{e.message}"
       end
       
       def execute_insert(sql)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.execute(sql); conn.last_insert_row_id}
+      rescue RuntimeError => e
+        raise Error::InvalidStatement, "#{sql}\r\n#{e.message}"
       end
       
       def single_value(sql)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.get_first_value(sql)}
+      rescue RuntimeError => e
+        raise Error::InvalidStatement, "#{sql}\r\n#{e.message}"
       end
       
       def execute_select(sql, &block)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.query(sql, &block)}
+      rescue RuntimeError => e
+        raise Error::InvalidStatement, "#{sql}\r\n#{e.message}"
       end
       
       def pragma_get(name)

data/lib/sequel_core/array_keys.rb

@@ -190,8 +190,7 @@ module ArrayKeys
   # The DatasetExtensions module provides extensions that modify
   # a dataset to return Array tuples instead of Hash tuples.
   module DatasetExtensions
-    # Fetches a dataset's records, converting each tuple into an array with 
-    # keys.
+    # Fetches a dataset's records, converting each tuple into an array with keys.
     def array_tuples_each(opts = nil, &block)
       fetch_rows(select_sql(opts)) {|h| block[Array.from_hash(h)]}
     end
@@ -240,6 +239,8 @@ module ArrayKeys
     end
 
     def array_tuples_transform_load(r)
+      puts "transform_load"
+      
       a = []; a.keys = []
       r.each_pair do |k, v|
         a[k] = (tt = @transform[k]) ? tt[0][v] : v
@@ -287,8 +288,12 @@ module Sequel
           include ArrayKeys::DatasetExtensions
           alias_method :each, :array_tuples_each
           alias_method :update_each_method, :array_tuples_update_each_method
-
+        end
+        
+        if method_defined?(:array_tuples_transform_load)
           alias_method :transform_load, :array_tuples_transform_load
+        end
+        if method_defined?(:array_tuples_transform_save)
           alias_method :transform_save, :array_tuples_transform_save
         end
       end

data/lib/sequel_core/core_sql.rb

@@ -189,7 +189,7 @@ class Symbol
   
   # Converts missing method calls into functions on columns, if the
   # method name is made of all upper case letters.
-  def method_missing(sym)
+  def method_missing(sym, *args)
     if ((s = sym.to_s) =~ /^([A-Z]+)$/)
       Sequel::SQL::Function.new(s.downcase, self)
     else

data/lib/sequel_core/database.rb

@@ -279,8 +279,8 @@ module Sequel
     #
     #   DB.drop_index :posts, :title
     #   DB.drop_index :posts, [:author, :title]
-    def drop_index(table, *args)
-      alter_table(table) {drop_index(*args)}
+    def drop_index(table, columns)
+      alter_table(table) {drop_index(columns)}
     end
     
     # Returns true if the given table exists.

data/lib/sequel_core/dataset/sql.rb

@@ -194,9 +194,19 @@ module Sequel
       end
       alias_method :distinct, :uniq
 
-      # Returns a copy of the dataset with the order changed.
+      # Returns a copy of the dataset with the order changed. If a nil is given
+      # the returned dataset has no order. This can accept multiple arguments
+      # of varying kinds, and even SQL functions.
+      #
+      #   ds.order(:name).sql #=> 'SELECT * FROM items ORDER BY name'
+      #   ds.order(:a, :b).sql #=> 'SELECT * FROM items ORDER BY a, b'
+      #   ds.order('a + b'.lit).sql #=> 'SELECT * FROM items ORDER BY a + b'
+      #   ds.order(:name.desc).sql #=> 'SELECT * FROM items ORDER BY name DESC'
+      #   ds.order(:name.asc).sql #=> 'SELECT * FROM items ORDER BY name ASC'
+      #   ds.order(:arr|1).sql #=> 'SELECT * FROM items ORDER BY arr[1]'
+      #   ds.order(nil).sql #=> 'SELECT * FROM items'
       def order(*order)
-        clone(:order => order)
+        clone(:order => (order == [nil]) ? nil : order)
       end
       alias_method :order_by, :order
       
@@ -223,15 +233,23 @@ module Sequel
       #   dataset.invert_order(:category, :price.desc]) #=>
       #     [:category.desc, :price]
       def invert_order(order)
+        return nil unless order
         new_order = []
         order.map do |f|
           if f.is_a?(Sequel::SQL::ColumnExpr) && (f.op == Sequel::SQL::ColumnMethods::DESC)
             f.l
+          elsif f.is_a?(Sequel::SQL::ColumnExpr) && (f.op == Sequel::SQL::ColumnMethods::ASC)
+            f.l.desc
           else
             f.desc
           end
         end
       end
+      
+      # Returns a copy of the dataset with no order.
+      def unordered
+        clone(:order => nil)
+      end
 
       # Returns a copy of the dataset with the results grouped by the value of 
       # the given columns
@@ -508,6 +526,12 @@ module Sequel
           "INSERT INTO #{@opts[:from]} DEFAULT VALUES"
         else
           values = values[0] if values.size == 1
+          
+          # if hash or array with keys we need to transform the values
+          if @transform && (values.is_a?(Hash) || (values.is_a?(Array) && values.keys))
+            values = transform_save(values)
+          end
+
           case values
           when Sequel::Model
             insert_sql(values.values)
@@ -516,14 +540,12 @@ module Sequel
               "INSERT INTO #{@opts[:from]} DEFAULT VALUES"
             elsif values.keys
               fl = values.keys.map {|f| literal(f.is_a?(String) ? f.to_sym : f)}
-              vl = @transform ? transform_save(values.values) : values.values
-              vl.map! {|v| literal(v)}
+              vl = values.values.map {|v| literal(v)}
               "INSERT INTO #{@opts[:from]} (#{fl.join(COMMA_SEPARATOR)}) VALUES (#{vl.join(COMMA_SEPARATOR)})"
             else
               "INSERT INTO #{@opts[:from]} VALUES (#{literal(values)})"
             end
           when Hash
-            values = transform_save(values) if @transform
             if values.empty?
               "INSERT INTO #{@opts[:from]} DEFAULT VALUES"
             else

data/lib/sequel_core/exceptions.rb

@@ -1,6 +1,9 @@
 module Sequel
   # Represents an error raised in Sequel code.
   class Error < StandardError
+    
+    # Error raised when an invalid statement is executed.
+    class InvalidStatement < Error; end
 
     # Rollback is a special error used to rollback a transactions.
     # A transaction block will catch this error and wont pass further up the stack.

data/lib/sequel_core/schema/schema_sql.rb

@@ -31,6 +31,7 @@ module Sequel
       COMMA_SEPARATOR = ', '.freeze
       UNIQUE = ' UNIQUE'.freeze
       NOT_NULL = ' NOT NULL'.freeze
+      NULL = ' NULL'.freeze
       UNSIGNED = ' UNSIGNED'.freeze
       PRIMARY_KEY = ' PRIMARY KEY'.freeze
 
@@ -61,9 +62,10 @@ module Sequel
         column[:size] ||= 255 if column[:type] == :varchar
         elements = column[:size] || column[:elements]
         sql << "(#{literal(elements)})" if elements
+        sql << UNSIGNED if column[:unsigned]
         sql << UNIQUE if column[:unique]
         sql << NOT_NULL if column[:null] == false
-        sql << UNSIGNED if column[:unsigned]
+        sql << NULL if column[:null] == true
         sql << " DEFAULT #{literal(column[:default])}" if column.include?(:default)
         sql << PRIMARY_KEY if column[:primary_key]
         sql << " #{auto_increment_sql}" if column[:auto_increment]

data/spec/adapters/informix_spec.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-INFORMIX_DB = Sequel('informix://localhost/mydb')
+unless defined?(INFORMIX_URL); INFORMIX_URL = 'informix://localhost/mydb' ;end
+
+INFORMIX_DB = Sequel(INFORMIX_URL)
 if INFORMIX_DB.table_exists?(:test)
   INFORMIX_DB.drop_table :test
 end

data/spec/adapters/mysql_spec.rb

@@ -1,7 +1,10 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 require 'logger'
 
-MYSQL_DB = Sequel('mysql://root@localhost/sandbox')
+unless defined?(MYSQL_URL); MYSQL_URL = 'mysql://root@localhost/sandbox' ;end
+
+MYSQL_DB = Sequel(MYSQL_URL)
 MYSQL_DB.drop_table(:items) if MYSQL_DB.table_exists?(:items)
 MYSQL_DB.drop_table(:test2) if MYSQL_DB.table_exists?(:test2)
 MYSQL_DB.create_table :items do

data/spec/adapters/oracle_spec.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-ORACLE_DB = Sequel('oracle://hr:hr@localhost/XE')
+unless defined?(ORACLE_URL); ORACLE_URL = 'oracle://hr:hr@localhost/XE' ;end
+
+ORACLE_DB = Sequel(ORACLE_URL)
 
 if ORACLE_DB.table_exists?(:items)
   ORACLE_DB.drop_table :items

data/spec/adapters/postgres_spec.rb

@@ -1,6 +1,10 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-PGSQL_DB = Sequel('postgres://postgres:postgres@localhost:5432/reality_spec')
+unless defined?(POSTGRES_URL); POSTGRES_URL = 'postgres://postgres:postgres@localhost:5432/reality_spec' ;end
+
+
+PGSQL_DB = Sequel(POSTGRES_URL)
 PGSQL_DB.drop_table(:test) if PGSQL_DB.table_exists?(:test)
 PGSQL_DB.drop_table(:test2) if PGSQL_DB.table_exists?(:test2)
   

data/spec/adapters/sqlite_spec.rb

@@ -1,6 +1,9 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
+require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-SQLITE_DB = Sequel('sqlite:/')
+unless defined?(SQLITE_URL); SQLITE_URL = 'sqlite:/' ;end
+
+SQLITE_DB = Sequel(SQLITE_URL)
 SQLITE_DB.create_table :items do
   integer :id, :primary_key => true, :auto_increment => true
   text :name
@@ -144,6 +147,20 @@ context "An SQLite database" do
       {:id => 3, :name => 'ghi'}
     ]
   end
+  
+  specify "should catch invalid SQL errors and raise them as Error::InvalidStatement" do
+    proc {@db.execute 'blah blah'}.should raise_error(
+      Sequel::Error::InvalidStatement, "blah blah\r\nnear \"blah\": syntax error")
+
+    proc {@db.execute_insert 'blah blah'}.should raise_error(
+      Sequel::Error::InvalidStatement, "blah blah\r\nnear \"blah\": syntax error")
+
+    proc {@db.execute_select 'blah blah'}.should raise_error(
+      Sequel::Error::InvalidStatement, "blah blah\r\nnear \"blah\": syntax error")
+
+    proc {@db.single_value 'blah blah'}.should raise_error(
+      Sequel::Error::InvalidStatement, "blah blah\r\nnear \"blah\": syntax error")
+  end
 end
 
 context "An SQLite dataset" do

data/spec/dataset_spec.rb

@@ -784,6 +784,22 @@ context "Dataset#order" do
     @dataset.order('dada ASC'.lit).sql.should ==
       'SELECT * FROM test ORDER BY dada ASC'
   end
+  
+  specify "should accept a nil to remove ordering" do
+    @dataset.order(:bah).order(nil).sql.should == 
+      'SELECT * FROM test'
+  end
+end
+
+context "Dataset#unordered" do
+  setup do
+    @dataset = Sequel::Dataset.new(nil).from(:test)
+  end
+  
+  specify "should remove ordering from the dataset" do
+    @dataset.order(:name).unordered.sql.should ==
+      'SELECT * FROM test'
+  end
 end
 
 context "Dataset#order_by" do
@@ -810,6 +826,11 @@ context "Dataset#order_by" do
     @dataset.order_by('dada ASC'.lit).sql.should ==
       'SELECT * FROM test ORDER BY dada ASC'
   end
+
+  specify "should accept a nil to remove ordering" do
+    @dataset.order_by(:bah).order_by(nil).sql.should == 
+      'SELECT * FROM test'
+  end
 end
 
 context "Dataset#order_more" do
@@ -843,6 +864,11 @@ context "Dataset#reverse_order" do
       'SELECT * FROM test ORDER BY name'
   end
   
+  specify "should invert the order for ASC expressions" do
+    @dataset.reverse_order(:name.ASC).sql.should ==
+      'SELECT * FROM test ORDER BY name DESC'
+  end
+  
   specify "should accept multiple arguments" do
     @dataset.reverse_order(:name, :price.DESC).sql.should ==
       'SELECT * FROM test ORDER BY name DESC, price'
@@ -855,6 +881,11 @@ context "Dataset#reverse_order" do
       'SELECT * FROM test ORDER BY clumsy, fool DESC'
   end
   
+  specify "should return an unordered dataset for a dataset with no order" do
+    @dataset.unordered.reverse_order.sql.should == 
+      'SELECT * FROM test'
+  end
+  
   specify "should have #reverse alias" do
     @dataset.order(:name).reverse.sql.should ==
       'SELECT * FROM test ORDER BY name DESC'

data/spec/schema_spec.rb

@@ -61,6 +61,14 @@ context "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (id integer, name text NOT NULL)"]
   end
   
+  specify "should accept null definition" do
+    @db.create_table(:cats) do
+      integer :id
+      text :name, :null => true
+    end
+    @db.sqls.should == ["CREATE TABLE cats (id integer, name text NULL)"]
+  end
+  
   specify "should accept unique definition" do
     @db.create_table(:cats) do
       integer :id

data/spec/spec_config.rb.example

@@ -0,0 +1,6 @@
+# connection URL's for running adapter specs
+INFORMIX_URL    = 'informix://localhost/mydb'
+MYSQL_URL       = 'mysql://root@localhost/sandbox'
+ORACLE_URL      = 'oracle://hr:hr@localhost/XE'
+POSTGRES_URL    = 'postgres://postgres:postgres@localhost:5432/reality_spec'
+SQLITE_URL      = 'sqlite:/'

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
 require 'rubygems'
 require File.join(File.dirname(__FILE__), "../lib/sequel_core") 
 
+if File.exists?(File.join(File.dirname(__FILE__), 'spec_config.rb'))
+  require File.join(File.dirname(__FILE__), 'spec_config.rb')
+end
+
 class MockDataset < Sequel::Dataset
   def insert(*args)
     @db.execute insert_sql(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: "1.3"
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-02-29 00:00:00 +02:00
+date: 2008-03-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Database access for Ruby
+description: The Database Toolkit for Ruby
 email: ciconia@gmail.com
 executables: 
 - sequel
@@ -87,11 +87,10 @@ files:
 - spec/pretty_table_spec.rb
 - spec/rcov.opts
 - spec/schema_generator_spec.rb
-- spec/schema_generator_spec.rb.rej
 - spec/schema_spec.rb
-- spec/schema_spec.rb.rej
 - spec/sequelizer_spec.rb
 - spec/spec.opts
+- spec/spec_config.rb.example
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 - lib/sequel_core
@@ -135,7 +134,7 @@ post_install_message:
 rdoc_options: 
 - --quiet
 - --title
-- "Sequel: Database access for Ruby"
+- "Sequel: The Database Toolkit for Ruby"
 - --opname
 - index.html
 - --line-numbers
@@ -166,6 +165,6 @@ rubyforge_project: sequel
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: Database access for Ruby
+summary: The Database Toolkit for Ruby
 test_files: []
 

data/spec/schema_generator_spec.rb.rej

@@ -1,35 +0,0 @@
-***************
-*** 82,87 ****
-        add_index [:fff, :ggg]
-        drop_index :hhh
-        add_full_text_index :blah
-      end
-    end
-  
---- 82,89 ----
-        add_index [:fff, :ggg]
-        drop_index :hhh
-        add_full_text_index :blah
-+       add_constraint :con1, ':fred > 100'
-+       drop_constraint :con2
-      end
-    end
-  
-***************
-*** 94,100 ****
-        {:op => :set_column_default, :name => :eee, :default => 1},
-        {:op => :add_index, :columns => [:fff, :ggg]},
-        {:op => :drop_index, :columns => [:hhh]},
--       {:op => :add_index, :columns => [:blah], :full_text => true}
-      ]
-    end
-- end--- 96,104 ----
-        {:op => :set_column_default, :name => :eee, :default => 1},
-        {:op => :add_index, :columns => [:fff, :ggg]},
-        {:op => :drop_index, :columns => [:hhh]},
-+       {:op => :add_index, :columns => [:blah], :full_text => true},
-+       {:op => :add_constraint, :type => :check, :name => :con1, :check => [':fred > 100']},
-+       {:op => :drop_constraint, :name => :con2}
-      ]
-    end
-+ end

data/spec/schema_spec.rb.rej

@@ -1,36 +0,0 @@
-***************
-*** 279,281 ****
-      @db.sqls.should == ['DROP TABLE cats']
-    end
-  end
---- 279,308 ----
-      @db.sqls.should == ['DROP TABLE cats']
-    end
-  end
-+ 
-+ context "DB#alter_table" do
-+   setup do
-+     @db = SchemaDummyDatabase.new
-+   end
-+ 
-+   specify "should accept add constraint definitions" do
-+     @db.alter_table(:cats) do
-+       add_constraint :valid_score, 'score <= 100'
-+     end
-+     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT valid_score CHECK (score <= 100)"]
-+     @db.sqls.clear
-+ 
-+     @db.alter_table(:cats) do
-+       add_constraint(:blah_blah) {:x > 0 && :y < 1}
-+     end
-+     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT blah_blah CHECK (((x > 0) AND (y < 1)))"]
-+   end
-+ 
-+   specify "should accept drop constraint definitions" do
-+     @db.alter_table(:cats) do
-+       drop_constraint :valid_score
-+     end
-+     @db.sqls.should == ["ALTER TABLE cats DROP CONSTRAINT valid_score"]
-+   end
-+ 
-+ end