sequel 0.4.0 → 0.4.1

data/lib/sequel/sqlite.rb

@@ -1,186 +1,2 @@
-if !Object.const_defined?('Sequel')
-  require File.join(File.dirname(__FILE__), '../sequel')
-end
-
-require 'sqlite3'
-
-module Sequel
-  module SQLite
-    class Database < Sequel::Database
-      set_adapter_scheme :sqlite
-    
-      def serial_primary_key_options
-        {:primary_key => true, :type => :integer, :auto_increment => true}
-      end
-
-      def connect
-        if @opts[:database].nil? || @opts[:database].empty?
-          @opts[:database] = ':memory:'
-        end
-        db = ::SQLite3::Database.new(@opts[:database])
-        db.type_translation = true
-        # fix for timestamp translation
-        db.translator.add_translator("timestamp") do |t, v|
-          v =~ /^\d+$/ ? Time.at(v.to_i) : Time.parse(v) 
-        end 
-        db
-      end
-      
-      def disconnect
-        @pool.disconnect {|c| c.close}
-      end
-    
-      def dataset(opts = nil)
-        SQLite::Dataset.new(self, opts)
-      end
-      
-      TABLES_FILTER = "type = 'table' AND NOT name = 'sqlite_sequence'"
-    
-      def tables
-        self[:sqlite_master].filter(TABLES_FILTER).map {|r| r[:name].to_sym}
-      end
-    
-      def execute(sql)
-        @logger.info(sql) if @logger
-        @pool.hold {|conn| conn.execute_batch(sql); conn.changes}
-      end
-      
-      def execute_insert(sql)
-        @logger.info(sql) if @logger
-        @pool.hold {|conn| conn.execute(sql); conn.last_insert_row_id}
-      end
-      
-      def single_value(sql)
-        @logger.info(sql) if @logger
-        @pool.hold {|conn| conn.get_first_value(sql)}
-      end
-      
-      def execute_select(sql, &block)
-        @logger.info(sql) if @logger
-        @pool.hold {|conn| conn.query(sql, &block)}
-      end
-      
-      def pragma_get(name)
-        single_value("PRAGMA #{name}")
-      end
-      
-      def pragma_set(name, value)
-        execute("PRAGMA #{name} = #{value}")
-      end
-      
-      AUTO_VACUUM = {'0' => :none, '1' => :full, '2' => :incremental}.freeze
-      
-      def auto_vacuum
-        AUTO_VACUUM[pragma_get(:auto_vacuum)]
-      end
-      
-      def auto_vacuum=(value)
-        value = AUTO_VACUUM.index(value) || (raise SequelError, "Invalid value for auto_vacuum option. Please specify one of :none, :full, :incremental.")
-        pragma_set(:auto_vacuum, value)
-      end
-      
-      SYNCHRONOUS = {'0' => :off, '1' => :normal, '2' => :full}.freeze
-      
-      def synchronous
-        SYNCHRONOUS[pragma_get(:synchronous)]
-      end
-      
-      def synchronous=(value)
-        value = SYNCHRONOUS.index(value) || (raise SequelError, "Invalid value for synchronous option. Please specify one of :off, :normal, :full.")
-        pragma_set(:synchronous, value)
-      end
-      
-      TEMP_STORE = {'0' => :default, '1' => :file, '2' => :memory}.freeze
-      
-      def temp_store
-        TEMP_STORE[pragma_get(:temp_store)]
-      end
-      
-      def temp_store=(value)
-        value = TEMP_STORE.index(value) || (raise SequelError, "Invalid value for temp_store option. Please specify one of :default, :file, :memory.")
-        pragma_set(:temp_store, value)
-      end
-      
-      def transaction(&block)
-        @pool.hold do |conn|
-          if conn.transaction_active?
-            return yield(conn)
-          end
-          begin
-            result = nil
-            conn.transaction {result = yield(conn)}
-            result
-          rescue => e
-            raise e unless SequelRollbackError === e
-          end
-        end
-      end
-    end
-    
-    class Dataset < Sequel::Dataset
-      def literal(v)
-        case v
-        when Time: literal(v.iso8601)
-        else
-          super
-        end
-      end
-
-      def insert_sql(*values)
-        if (values.size == 1) && values.first.is_a?(Sequel::Dataset)
-          "INSERT INTO #{@opts[:from]} #{values.first.sql};"
-        else
-          super(*values)
-        end
-      end
-
-      def fetch_rows(sql, &block)
-        @db.execute_select(sql) do |result|
-          @columns = result.columns.map {|c| c.to_sym}
-          column_count = @columns.size
-          result.each do |values|
-            row = {}
-            column_count.times {|i| row[@columns[i]] = values[i]}
-            block.call(row)
-          end
-        end
-      end
-      
-      def array_tuples_fetch_rows(sql, &block)
-        @db.execute_select(sql) do |result|
-          @columns = result.columns.map {|c| c.to_sym}
-          result.each {|r| r.keys = @columns; block[r]}
-        end
-      end
-    
-      def insert(*values)
-        @db.execute_insert insert_sql(*values)
-      end
-    
-      def update(values, opts = nil)
-        @db.execute update_sql(values, opts)
-      end
-    
-      def delete(opts = nil)
-        # check if no filter is specified
-        unless (opts && opts[:where]) || @opts[:where]
-          @db.transaction do
-            unfiltered_count = count
-            @db.execute delete_sql(opts)
-            unfiltered_count
-          end
-        else
-          @db.execute delete_sql(opts)
-        end
-      end
-      
-      EXPLAIN = 'EXPLAIN %s'.freeze
-
-      def explain
-        res = []
-        @db.result_set(EXPLAIN % select_sql(opts), nil) {|r| res << r}
-        res
-      end
-    end
-  end
-end
+warn "Requiring 'sequel/sqlite' is deprecated. Please modify your code to require 'sequel' instead."
+require File.join(File.dirname(__FILE__), 'adapters/sqlite')

data/spec/database_spec.rb

@@ -375,9 +375,7 @@ context "A Database adapter with a scheme" do
     c.opts[:database].should == 'db'
   end
 
-  specify "should register a convenience method on Sequel" do
-    Sequel.should respond_to(:ccc)
-    
+  specify "should be accessible through Sequel.<adapter>" do
     # invalid parameters
     proc {Sequel.ccc('abc', 'def')}.should raise_error(SequelError)
     
@@ -396,16 +394,16 @@ context "A Database adapter with a scheme" do
 end
 
 context "An unknown database scheme" do
-  specify "should raise an exception in Sequel::Database.connect" do
-    proc {Sequel::Database.connect('ddd://localhost/db')}.should raise_error(SequelError)
+  specify "should raise an error in Sequel::Database.connect" do
+    proc {Sequel::Database.connect('ddd://localhost/db')}.should raise_error(LoadError)
   end
 
-  specify "should raise an exception in Sequel.connect" do
-    proc {Sequel.connect('ddd://localhost/db')}.should raise_error(SequelError)
+  specify "should raise an error in Sequel.connect" do
+    proc {Sequel.connect('ddd://localhost/db')}.should raise_error(LoadError)
   end
 
-  specify "should raise an exception in Sequel.open" do
-    proc {Sequel.open('ddd://localhost/db')}.should raise_error(SequelError)
+  specify "should raise an error in Sequel.open" do
+    proc {Sequel.open('ddd://localhost/db')}.should raise_error(LoadError)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-11-24 00:00:00 +02:00
+date: 2007-11-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - README
 - Rakefile
 - bin/sequel
+- doc/rdoc
 - spec/adapters
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
@@ -74,42 +75,51 @@ files:
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 - lib/sequel
+- lib/sequel/adapters
+- lib/sequel/adapters/ado.rb
+- lib/sequel/adapters/db2.rb
+- lib/sequel/adapters/dbi.rb
+- lib/sequel/adapters/informix.rb
+- lib/sequel/adapters/mysql.rb
+- lib/sequel/adapters/odbc.rb
+- lib/sequel/adapters/oracle.rb
+- lib/sequel/adapters/postgres.rb
+- lib/sequel/adapters/sqlite.rb
 - lib/sequel/ado.rb
+- lib/sequel/array_keys.rb
+- lib/sequel/connection_pool.rb
+- lib/sequel/core_ext.rb
+- lib/sequel/core_sql.rb
+- lib/sequel/database.rb
+- lib/sequel/dataset
+- lib/sequel/dataset/convenience.rb
+- lib/sequel/dataset/sequelizer.rb
+- lib/sequel/dataset/sql.rb
+- lib/sequel/dataset.rb
 - lib/sequel/db2.rb
 - lib/sequel/dbi.rb
+- lib/sequel/error.rb
 - lib/sequel/informix.rb
+- lib/sequel/migration.rb
+- lib/sequel/model
+- lib/sequel/model/base.rb
+- lib/sequel/model/caching.rb
+- lib/sequel/model/hooks.rb
+- lib/sequel/model/record.rb
+- lib/sequel/model/relations.rb
+- lib/sequel/model/schema.rb
+- lib/sequel/model.rb
 - lib/sequel/mysql.rb
 - lib/sequel/odbc.rb
 - lib/sequel/oracle.rb
 - lib/sequel/postgres.rb
+- lib/sequel/pretty_table.rb
+- lib/sequel/schema
+- lib/sequel/schema/schema_generator.rb
+- lib/sequel/schema/schema_sql.rb
+- lib/sequel/schema.rb
 - lib/sequel/sqlite.rb
-- lib/sequel-core
-- lib/sequel-core/array_keys.rb
-- lib/sequel-core/connection_pool.rb
-- lib/sequel-core/core_ext.rb
-- lib/sequel-core/core_sql.rb
-- lib/sequel-core/database.rb
-- lib/sequel-core/dataset
-- lib/sequel-core/dataset/convenience.rb
-- lib/sequel-core/dataset/sequelizer.rb
-- lib/sequel-core/dataset/sql.rb
-- lib/sequel-core/dataset.rb
-- lib/sequel-core/error.rb
-- lib/sequel-core/migration.rb
-- lib/sequel-core/model
-- lib/sequel-core/model/base.rb
-- lib/sequel-core/model/caching.rb
-- lib/sequel-core/model/hooks.rb
-- lib/sequel-core/model/record.rb
-- lib/sequel-core/model/relations.rb
-- lib/sequel-core/model/schema.rb
-- lib/sequel-core/model.rb
-- lib/sequel-core/pretty_table.rb
-- lib/sequel-core/schema
-- lib/sequel-core/schema/schema_generator.rb
-- lib/sequel-core/schema/schema_sql.rb
-- lib/sequel-core/schema.rb
-- lib/sequel-core/worker.rb
+- lib/sequel/worker.rb
 - lib/sequel.rb
 - CHANGELOG
 has_rdoc: true