sequel 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,18 @@
+*0.1.4*
+
+* Added String#split_sql.
+
+* Implemented Array#to_sql and String#to_sql. Database#to_sql can now take an array of strings and convert into an SQL string. Comments and excessive white-space are removed.
+
+* Improved Schema generator to support data types as method names:
+  DB.create_table :test do
+    integer :abc
+    text :def
+    ...
+  end
+
+* Implemented ODBC adapter.
+
 *0.1.3*
 
 * Implemented DBI adapter.

data/README

@@ -31,6 +31,7 @@ Sequel currently supports:
 * Postgresql
 * SQLite 3
 * DBI
+* ODBC
 * MySQL (basic support)
 
 == The Sequel Console

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.1.3"
+VERS = "0.1.4"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/core_ext.rb

@@ -3,4 +3,29 @@ module Enumerable
   def send_each(sym, *args)
     each {|i| i.send(sym, *args)}
   end
-end
+end
+
+# Array extensions
+class Array
+  # Concatenates an array of strings into an SQL string. ANSI SQL and C-style
+  # comments are removed, as well as excessive white-space.
+  def to_sql
+    map {|l| (l =~ /^(.*)--/ ? $1 : l).chomp}.join(' '). \
+      gsub(/\/\*.*\*\//, '').gsub(/\s+/, ' ').strip
+  end
+end
+
+# String extensions
+class String
+  # Converts a string into an SQL string by removing comments.
+  # See also Array#to_sql.
+  def to_sql
+    split($/).to_sql
+  end
+  
+  # Splits a string into separate SQL statements, removing comments
+  # and excessive white-space.
+  def split_sql
+    to_sql.split(';').map {|s| s.strip}
+  end
+end

data/lib/sequel/database.rb

@@ -62,7 +62,10 @@ module Sequel
       raise NotImplementedError
     end
     
-    def <<(sql); execute(sql); end
+    # Executes the supplied SQL. The SQL can be supplied as a string or as an
+    # array of strings. Comments and excessive white space are removed. See
+    # also Array#to_sql.
+    def <<(sql); execute(sql.to_sql); end
     
     # Acquires a database connection, yielding it to the passed block.
     def synchronize(&block)

data/lib/sequel/odbc.rb

@@ -0,0 +1,108 @@
+if !Object.const_defined?('Sequel')
+  require File.join(File.dirname(__FILE__), '../sequel')
+end
+
+require 'odbc'
+
+module Sequel
+  module ODBC
+    class Database < Sequel::Database
+      set_adapter_scheme :odbc
+    
+      def connect
+        conn = ::ODBC::connect(@opts[:database], @opts[:user], @opts[:password])
+        conn.autocommit = true
+        conn
+      end
+    
+      def dataset(opts = nil)
+        ODBC::Dataset.new(self, opts)
+      end
+    
+      def execute(sql)
+        @logger.info(sql) if @logger
+        @pool.hold do |conn|
+          conn.run(sql)
+        end
+      end
+      
+      def do(sql)
+        @logger.info(sql) if @logger
+        @pool.hold do |conn|
+          conn.do(sql)
+        end
+      end
+    end
+    
+    class Dataset < Sequel::Dataset
+      def literal(v)
+        case v
+        when true: '1'
+        when false: '0'
+        else
+          super
+        end
+      end
+
+      def each(opts = nil, &block)
+        @db.synchronize do
+          s = @db.execute select_sql(opts)
+          begin
+            fetch_rows(s, &block)
+            s.fetch {|r| yield hash_row(s, r)}
+          ensure
+            s.drop unless s.nil? rescue nil
+          end
+        end
+        self
+      end
+      
+      def fetch_rows(stmt)
+        columns = stmt.columns(true).map {|c| c.name.to_sym}
+        rows = stmt.fetch_all
+        rows.each {|row| yield hash_row(stmt, columns, row)}
+      end
+      
+      def hash_row(stmt, columns, row)
+        hash = {}
+        row.each_with_index do |v, idx|
+          hash[columns[idx]] = convert_odbc_value(v)
+        end
+        hash
+      end
+      
+      def convert_odbc_value(v)
+        # When fetching a result set, the Ruby ODBC driver converts all ODBC 
+        # SQL types to an equivalent Ruby type; with the exception of
+        # SQL_TYPE_DATE, SQL_TYPE_TIME and SQL_TYPE_TIMESTAMP.
+        #
+        # The conversions below are consistent with the mappings in
+        # ODBCColumn#mapSqlTypeToGenericType and Column#klass.
+        case v
+        when ::ODBC::TimeStamp
+          Time.gm(v.year, v.month, v.day, v.hour, v.minute, v.second)
+        when ::ODBC::Time
+          DateTime.now
+          Time.gm(now.year, now.month, now.day, v.hour, v.minute, v.second)
+        when ::ODBC::Date
+          Date.new(v.year, v.month, v.day)
+        else
+          v
+        end
+      end
+      
+      def insert(*values)
+        @db.do insert_sql(*values)
+      end
+    
+      def update(values, opts = nil)
+        @db.do update_sql(values, opts)
+        self
+      end
+    
+      def delete(opts = nil)
+        @db.do delete_sql(opts)
+      end
+    end
+  end
+end

data/lib/sequel/schema.rb

@@ -88,6 +88,11 @@ module Sequel
         instance_eval(&block)
       end
       
+      def method_missing(type, name = nil, opts = nil)
+        return super unless name
+        column(name, type, opts)
+      end
+      
       def primary_key(name, type = nil, opts = nil)
         @primary_key = {
           :name => name, 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2007-05-20 00:00:00 +03:00
+  version: 0.1.4
+date: 2007-05-25 00:00:00 +03:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib
@@ -33,21 +33,23 @@ files:
 - README
 - Rakefile
 - bin/sequel
+- doc/rdoc
 - lib/sequel
-- lib/sequel/pretty_table.rb
-- lib/sequel/model.rb
-- lib/sequel/schema.rb
-- lib/sequel/sqlite.rb
-- lib/sequel/database.rb
-- lib/sequel/dataset.rb
-- lib/sequel/mysql.rb
-- lib/sequel/postgres.rb
+- lib/sequel.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/core_ext.rb
+- lib/sequel/database.rb
+- lib/sequel/dataset.rb
+- lib/sequel/dbi.rb
 - lib/sequel/error.rb
 - lib/sequel/expressions.rb
-- lib/sequel/dbi.rb
-- lib/sequel.rb
+- lib/sequel/model.rb
+- lib/sequel/mysql.rb
+- lib/sequel/odbc.rb
+- lib/sequel/postgres.rb
+- lib/sequel/pretty_table.rb
+- lib/sequel/schema.rb
+- lib/sequel/sqlite.rb
 - CHANGELOG
 test_files: []