sequel_core 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.0.3 (2008-01-17)
+
+* Added support for UNSIGNED constraint, used in MySQL? (#127).
+
+* Implemented constraint definitions inside Database#create_table.
+
+* Fixed postgres adapter to define PGconn#async_exec as alias to #exec if not defined (for pure-ruby postgres driver).
+
+* Added String#to_date. Updated mysql adapter to use String#to_date for mysql date types (thanks drfreeze).
+
 === 1.0.2 (2008-01-14)
 
 * Removed ConnectionPool, NumericExtensions. Added dependency on assistance.

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.0.2"
+VERS = "1.0.3"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/sequel_core/adapters/mysql.rb

@@ -13,11 +13,11 @@ class Mysql::Result
     7   => :to_time,  # MYSQL_TYPE_TIMESTAMP
     8   => :to_i,     # MYSQL_TYPE_LONGLONG
     9   => :to_i,     # MYSQL_TYPE_INT24
-    10  => :to_time,  # MYSQL_TYPE_DATE
+    10  => :to_date,  # MYSQL_TYPE_DATE
     11  => :to_time,  # MYSQL_TYPE_TIME
     12  => :to_time,  # MYSQL_TYPE_DATETIME
     13  => :to_i,     # MYSQL_TYPE_YEAR
-    14  => :to_time,  # MYSQL_TYPE_NEWDATE
+    14  => :to_date,  # MYSQL_TYPE_NEWDATE
     # 15  => :to_s      # MYSQL_TYPE_VARCHAR
     # 16  => :to_s,     # MYSQL_TYPE_BIT
     246 => :to_d,     # MYSQL_TYPE_NEWDECIMAL

data/lib/sequel_core/adapters/postgres.rb

@@ -43,6 +43,10 @@ class PGconn
     status == PGconn::CONNECTION_OK
   end
   
+  unless instance_methods.include?('async_exec')
+    alias_method :async_exec, :exec
+  end
+  
   def execute(sql)
     begin
       async_exec(sql)

data/lib/sequel_core/core_sql.rb

@@ -52,7 +52,15 @@ class String
     rescue Exception => e
       raise Sequel::Error::InvalidValue, "Invalid time value '#{self}' (#{e.message})"
     end
-     # Why does Time.parse('0000-00-00') bork and not return nil or some such?
+  end
+
+  # Converts a string into a Date object.
+  def to_date
+    begin
+      Date.parse(self)
+    rescue Exception => e
+      raise Sequel::Error::InvalidValue, "Invalid date value '#{self}' (#{e.message})"
+    end
   end
 end
 

data/lib/sequel_core/schema/schema_generator.rb

@@ -40,6 +40,14 @@ module Sequel
         index(name) if opts[:index]
       end
       
+      def check(*args, &block)
+        @columns << {:name => nil, :type => :check, :check => block || args}
+      end
+
+      def constraint(name, *args, &block)
+        @columns << {:name => name, :type => :check, :check => block || args}
+      end
+      
       def has_column?(name)
         @columns.each {|c| return true if c[:name] == name}
         false

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
+      UNSIGNED = ' UNSIGNED'.freeze
       PRIMARY_KEY = ' PRIMARY KEY'.freeze
 
       TYPES = Hash.new {|h, k| k}
@@ -43,14 +44,22 @@ module Sequel
       def literal(v)
         schema_utility_dataset.literal(v)
       end
+      
+      def expression_list(*args, &block)
+        schema_utility_dataset.expression_list(*args, &block)
+      end
 
       def column_definition_sql(column)
+        if column[:type] == :check
+          return constraint_definition_sql(column)
+        end
         sql = "#{literal(column[:name].to_sym)} #{TYPES[column[:type]]}"
         column[:size] ||= 255 if column[:type] == :varchar
         elements = column[:size] || column[:elements]
         sql << "(#{literal(elements)})" if elements
         sql << UNIQUE if column[:unique]
         sql << NOT_NULL if column[:null] == false
+        sql << UNSIGNED if column[:unsigned]
         sql << " DEFAULT #{literal(column[:default])}" if column.include?(:default)
         sql << PRIMARY_KEY if column[:primary_key]
         if column[:table]
@@ -61,6 +70,13 @@ module Sequel
         sql << " #{auto_increment_sql}" if column[:auto_increment]
         sql
       end
+      
+      def constraint_definition_sql(column)
+        sql = column[:name] ? "CONSTRAINT #{literal(column[:name].to_sym)} " : ""
+        
+        sql << "CHECK #{expression_list(column[:check], true)}"
+        sql
+      end
   
       def column_list_sql(columns)
         columns.map {|c| column_definition_sql(c)}.join(COMMA_SEPARATOR)

data/spec/core_sql_spec.rb

@@ -299,3 +299,13 @@ context "String#to_time" do
   end
 end
 
+context "String#to_date" do
+  specify "should convert the string into a Date object" do
+    "2007-07-11".to_date.should == Date.parse("2007-07-11")
+  end
+  
+  specify "should raise Error::InvalidValue for an invalid date" do
+    proc {'0000-00-00'.to_time}.should raise_error(Sequel::Error::InvalidValue)
+  end
+end
+

data/spec/schema_generator_spec.rb

@@ -7,6 +7,8 @@ describe Sequel::Schema::Generator do
       column :body, :text
       foreign_key :parent_id
       primary_key :id
+      check 'price > 100'
+      constraint(:xxx) {:yyy == :zzz}
       index :title
       index [:title, :body]
     end
@@ -19,8 +21,8 @@ describe Sequel::Schema::Generator do
     end
   end
   
-  it "counts primary key as column" do
-    @columns.size.should == 4
+  it "counts primary key, column and constraint definitions as columns" do
+    @columns.size.should == 6
   end
   
   it "places primary key first" do
@@ -52,6 +54,16 @@ describe Sequel::Schema::Generator do
     @generator.has_column?(:foo).should_not be_true
   end
   
+  it "creates constraints" do
+    @columns[4][:name].should == nil
+    @columns[4][:type].should == :check
+    @columns[4][:check].should == ['price > 100']
+
+    @columns[5][:name].should == :xxx
+    @columns[5][:type].should == :check
+    @columns[5][:check].should be_a_kind_of(Proc)
+  end
+  
   it "creates indexes" do
     @indexes[0][:columns].should include(:title)
     @indexes[1][:columns].should include(:title)

data/spec/schema_spec.rb

@@ -69,6 +69,13 @@ context "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (id integer, name text UNIQUE)"]
   end
   
+  specify "should accept unsigned definition" do
+    @db.create_table(:cats) do
+      integer :value, :unsigned => true
+    end
+    @db.sqls.should == ["CREATE TABLE cats (value integer UNSIGNED)"]
+  end
+  
   specify "should accept [SET|ENUM](...) types" do
     @db.create_table(:cats) do
       set :color, :elements => ['black', 'tricolor', 'grey']
@@ -205,6 +212,34 @@ context "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (id integer)", "CREATE UNIQUE INDEX cats_id_name_index ON cats (id, name)"]
   end
+  
+  specify "should accept unnamed constraint definitions" do
+    @db.create_table(:cats) do
+      integer :score
+      check {:x > 0 && :y < 1}
+    end
+    @db.sqls.should == ["CREATE TABLE cats (score integer, CHECK (((x > 0) AND (y < 1))))"]
+    @db.sqls.clear
+
+    @db.create_table(:cats) do
+      check 'price < ?', 100
+    end
+    @db.sqls.should == ["CREATE TABLE cats (CHECK (price < 100))"]
+  end
+
+  specify "should accept named constraint definitions" do
+    @db.create_table(:cats) do
+      integer :score
+      constraint :valid_score, 'score <= 100'
+    end
+    @db.sqls.should == ["CREATE TABLE cats (score integer, CONSTRAINT valid_score CHECK (score <= 100))"]
+    @db.sqls.clear
+
+    @db.create_table(:cats) do
+      constraint(:blah_blah) {:x > 0 && :y < 1}
+    end
+    @db.sqls.should == ["CREATE TABLE cats (CONSTRAINT blah_blah CHECK (((x > 0) AND (y < 1))))"]
+  end
 end
 
 context "DB#create_table!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-14 00:00:00 +02:00
+date: 2008-01-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency