sequel 0.2.0.2 → 0.2.1

data/lib/sequel/model/base.rb

@@ -0,0 +1,84 @@
+module Sequel
+  class Model
+    # returns the database associated with the model class
+    def self.db
+      @db ||= ((superclass != Object) && (superclass.db)) || \
+        raise(SequelError, "No database associated with #{self}.")
+    end
+    
+    # sets the database associated with the model class
+    def self.db=(db); @db = db; end
+    
+    # called when a database is opened in order to automatically associate the
+    # first opened database with model classes.
+    def self.database_opened(db)
+      @db = db if self == Model && !@db
+    end
+
+    # returns the dataset associated with the model class.
+    def self.dataset
+      @dataset || super_dataset || raise(SequelError, "No dataset associated with #{self}.")
+    end
+    
+    def self.super_dataset
+      if superclass && superclass.respond_to?(:dataset) && ds = superclass.dataset
+        ds
+      end
+    end
+    
+    def self.columns
+      @columns ||= @dataset.columns || raise(SequelError, "Could not fetch columns for #{self}")
+    end
+
+    # Sets the dataset associated with the model class.
+    def self.set_dataset(ds)
+      @db = ds.db
+      @dataset = ds
+      @dataset.set_model(self)
+      @dataset.transform(@transform) if @transform
+    end
+    
+    def model
+      @model ||= self.class
+    end
+    
+    # Returns the dataset assoiated with the object's model class.
+    def db
+      @db ||= model.db
+    end
+
+    # Returns the dataset assoiated with the object's model class.
+    def dataset
+      @dataset ||= model.dataset
+    end
+    
+    def columns
+      @columns ||= model.columns
+    end
+
+    SERIALIZE_FORMATS = {
+      :yaml => [proc {|v| YAML.load v if v}, proc {|v| v.to_yaml}],
+      :marshal => [proc {|v| Marshal.load(v) if v}, proc {|v| Marshal.dump(v)}]
+    }
+
+    def self.serialize(*columns)
+      format = columns.pop[:format] if Hash === columns.last
+      filters = SERIALIZE_FORMATS[format || :yaml]
+      # add error handling here
+      
+      @transform = columns.inject({}) do |m, c|
+        m[c] = filters
+        m
+      end
+    end
+  end
+
+  def self.Model(source)
+    @models ||= {}
+    @models[source] ||= Class.new(Sequel::Model) do
+      meta_def(:inherited) do |c|
+        c.set_dataset(source.is_a?(Dataset) ? source : c.db[source])
+      end
+    end
+  end
+end

data/lib/sequel/model/hooks.rb

@@ -0,0 +1,40 @@
+module Sequel
+  class Model
+    def self.get_hooks(key)
+      @hooks ||= {}
+      @hooks[key] ||= []
+    end
+    
+    def self.has_hooks?(key)
+      !get_hooks(key).empty?
+    end
+    
+    def run_hooks(key)
+      self.class.get_hooks(key).each {|h| instance_eval(&h)}
+    end
+    
+    def self.before_save(&block)
+      get_hooks(:before_save).unshift(block)
+    end
+    
+    def self.before_create(&block)
+      get_hooks(:before_create).unshift(block)
+    end
+    
+    def self.before_destroy(&block)
+      get_hooks(:before_destroy).unshift(block)
+    end
+    
+    def self.after_save(&block)
+      get_hooks(:after_save) << block
+    end
+    
+    def self.after_create(&block)
+      get_hooks(:after_create) << block
+    end
+    
+    def self.after_destroy(&block)
+      get_hooks(:after_destroy) << block
+    end
+  end
+end

data/lib/sequel/model/record.rb

@@ -0,0 +1,154 @@
+module Sequel
+  class Model
+    attr_reader :values
+
+    def self.primary_key; :id; end
+    def self.primary_key_hash(v); {:id => v}; end
+    
+    def self.set_primary_key(key)
+      # if k is nil, we go to no_primary_key
+      return no_primary_key unless key
+      
+      # redefine primary_key
+      meta_def(:primary_key) {key}
+      
+      if key.is_a?(Array) # composite key
+        class_def(:this) do
+          @this ||= self.class.dataset.filter( \
+            @values.reject {|k, v| !key.include?(k)} \
+          ).naked
+        end
+        meta_def(:primary_key_hash) do |v|
+          key.inject({}) {|m, i| m[i] = v.shift; m}
+        end
+      else # regular key
+        class_def(:this) do
+          @this ||= self.class.dataset.filter(key => @values[key]).naked
+        end
+        meta_def(:primary_key_hash) do |v|
+          {key => v}
+        end
+      end
+    end
+    
+    def self.no_primary_key
+      meta_def(:primary_key) {nil}
+      meta_def(:primary_key_hash) {|v| raise SequelError, "#{self} does not have a primary key"}
+      class_def(:this) {raise SequelError, "No primary key is associated with this model"}
+    end
+    
+    def self.create(values = {})
+      db.transaction do
+        obj = new(values, true)
+        obj.save
+        obj
+      end
+    end
+    
+    def this
+      @this ||= self.class.dataset.filter(:id => @values[:id]).naked
+    end
+    
+    # instance method
+    def primary_key
+      @primary_key ||= self.class.primary_key
+    end
+    
+    def pkey
+      @pkey ||= @values[primary_key]
+    end
+    
+    def initialize(values = {}, new = false)
+      @values = values
+      @new = new
+      if !new # determine if it's a new record
+        pk = primary_key
+        @new = (pk == nil) || (!(Array === pk) && !@values[pk])
+      end
+    end
+    
+    def new?
+      @new
+    end
+    
+    def exists?
+      this.count > 0
+    end
+    
+    def save
+      run_hooks(:before_save)
+      if @new
+        run_hooks(:before_create)
+        iid = model.dataset.insert(@values)
+        # if we have a regular primary key and it's not set in @values,
+        # we assume it's the last inserted id
+        if (pk = primary_key) && !(Array === pk) && !@values[pk]
+          @values[pk] = iid
+        end
+        if pk
+          @this = nil # remove memoized this dataset
+          refresh
+        end
+        run_hooks(:after_create)
+      else
+        run_hooks(:before_update)
+        this.update(@values)
+        run_hooks(:after_update)
+      end
+      run_hooks(:after_save)
+      @new = false
+      self
+    end
+
+    def set(values)
+      this.update(values)
+      @values.merge!(values)
+    end
+    
+    def refresh
+      @values = this.first || raise(SequelError, "Record not found")
+      self
+    end
+
+    def destroy
+      db.transaction do
+        run_hooks(:before_destroy)
+        delete
+        run_hooks(:after_destroy)
+      end
+    end
+    
+    def delete
+      this.delete
+      self
+    end
+    
+    ATTR_RE = /^([a-zA-Z_]\w*)(=)?$/.freeze
+
+    def method_missing(m, *args)
+      if m.to_s =~ ATTR_RE
+        att = $1.to_sym
+        write = $2 == '='
+        
+        # check wether the column is legal
+        unless columns.include?(att)
+          raise SequelError, "Invalid column (#{att.inspect}) for #{self}"
+        end
+
+        # define the column accessor
+        Thread.exclusive do
+          if write
+            model.class_def(m) {|v| @values[att] = v}
+          else
+            model.class_def(m) {@values[att]}
+          end
+        end
+        
+        # call the accessor
+        respond_to?(m) ? send(m, *args) : super(m, *args)
+      else
+        super(m, *args)
+      end
+    end
+  end
+end

data/lib/sequel/model/relations.rb

@@ -0,0 +1,26 @@
+module Sequel
+  class Model
+    ONE_TO_ONE_PROC = "proc {i = @values[:%s]; %s[i] if i}".freeze
+    ID_POSTFIX = "_id".freeze
+    FROM_DATASET = "db[%s]".freeze
+    
+    def self.one_to_one(name, opts)
+      klass = opts[:class] ? opts[:class] : (FROM_DATASET % name.inspect)
+      key = opts[:key] || (name.to_s + ID_POSTFIX)
+      define_method name, &eval(ONE_TO_ONE_PROC % [key, klass])
+    end
+  
+    ONE_TO_MANY_PROC = "proc {%s.filter(:%s => pkey)}".freeze
+    ONE_TO_MANY_ORDER_PROC = "proc {%s.filter(:%s => pkey).order(%s)}".freeze
+    def self.one_to_many(name, opts)
+      klass = opts[:class] ? opts[:class] :
+        (FROM_DATASET % (opts[:table] || name.inspect))
+      key = opts[:on]
+      order = opts[:order]
+      define_method name, &eval(
+        (order ? ONE_TO_MANY_ORDER_PROC : ONE_TO_MANY_PROC) %
+        [klass, key, order.inspect]
+      )
+    end
+  end
+end

data/lib/sequel/model/schema.rb

@@ -0,0 +1,36 @@
+module Sequel
+  class Model
+    def self.set_schema(name = nil, &block)
+      name ? set_dataset(db[name]) : name = table_name
+      @schema = Schema::Generator.new(db, name, &block)
+      if @schema.primary_key_name
+        set_primary_key @schema.primary_key_name
+      end
+    end
+    
+    def self.schema
+      @schema || ((superclass != Model) && (superclass.schema))
+    end
+
+    def self.table_name
+      dataset.opts[:from].first
+    end
+    
+    def self.table_exists?
+      db.table_exists?(table_name)
+    end
+    
+    def self.create_table
+      db.create_table_sql_list(*schema.create_info).each {|s| db << s} 
+    end
+    
+    def self.drop_table
+      db.execute db.drop_table_sql(table_name)
+    end
+    
+    def self.recreate_table
+      drop_table if table_exists?
+      create_table
+    end
+  end
+end

data/lib/sequel/mysql.rb

@@ -69,10 +69,10 @@ module Sequel
         conn = Mysql.real_connect(@opts[:host], @opts[:user], @opts[:password], 
           @opts[:database], @opts[:port])
         conn.query_with_result = false
-        if @opts[:charset]
-          conn.query("set character_set_connection = '#{@opts[:charset]}';")
-          conn.query("set character_set_client = '#{@opts[:charset]}';")
-          conn.query("set character_set_results = '#{@opts[:charset]}';")
+        if encoding = @opts[:encoding] || @opts[:charset]
+          conn.query("set character_set_connection = '#{encoding}';")
+          conn.query("set character_set_client = '#{encoding}';")
+          conn.query("set character_set_results = '#{encoding}';")
         end
         conn.reconnect = true
         conn
@@ -95,7 +95,7 @@ module Sequel
         end
       end
       
-      def query(sql)
+      def execute_select(sql)
         @logger.info(sql) if @logger
         @pool.hold do |conn|
           conn.query(sql)
@@ -176,7 +176,9 @@ module Sequel
       def match_expr(l, r)
         case r
         when Regexp:
-          "(#{literal(l)} REGEXP #{literal(r.source)})"
+          r.casefold? ? \
+            "(#{literal(l)} REGEXP #{literal(r.source)})" :
+            "(#{literal(l)} REGEXP BINARY #{literal(r.source)})"
         else
           super
         end
@@ -213,7 +215,7 @@ module Sequel
       
       def fetch_rows(sql)
         @db.synchronize do
-          r = @db.query(sql)
+          r = @db.execute_select(sql)
           begin
             @columns = r.columns
             r.each_hash {|row| yield row}

data/lib/sequel/postgres.rb

@@ -141,7 +141,7 @@ module Sequel
       set_adapter_scheme :postgres
     
       def connect
-        PGconn.connect(
+        conn = PGconn.connect(
           @opts[:host] || 'localhost',
           @opts[:port] || 5432,
           '', '',
@@ -149,6 +149,10 @@ module Sequel
           @opts[:user],
           @opts[:password]
         )
+        if encoding = @opts[:encoding] || @opts[:charset]
+          conn.set_client_encoding(encoding)
+        end
+        conn
       end
     
       def dataset(opts = nil)
@@ -282,9 +286,6 @@ module Sequel
         end
       end
     
-      LIKE = '(%s ~ %s)'.freeze
-      LIKE_CI = '%s ~* %s'.freeze
-      
       def match_expr(l, r)
         case r
         when Regexp:

data/lib/sequel/schema/schema_generator.rb

@@ -6,6 +6,7 @@ module Sequel
         @table_name = table_name
         @columns = []
         @indexes = []
+        @primary_key = nil
         instance_eval(&block)
       end
       

data/lib/sequel/sqlite.rb

@@ -47,7 +47,7 @@ module Sequel
         @pool.hold {|conn| conn.get_first_value(sql)}
       end
       
-      def query(sql, &block)
+      def execute_select(sql, &block)
         @logger.info(sql) if @logger
         @pool.hold {|conn| conn.query(sql, &block)}
       end
@@ -105,7 +105,7 @@ module Sequel
       end
 
       def fetch_rows(sql, &block)
-        @db.query(sql) do |result|
+        @db.execute_select(sql) do |result|
           @columns = result.columns.map {|c| c.to_sym}
           column_count = @columns.size
           result.each do |values|