sequel 0.1.9 → 0.1.9.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 0.1.9.1 (2007-07-22)
+
+* Improved robustness of MySQL::Dataset#field_name.
+
+* Added Sequel.single_threaded= convenience method.
+
 === 0.1.9 (2007-07-21)
 
 * Fixed #update_sql and #insert_sql to support field quoting by calling #field_name.

data/Rakefile

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

data/lib/sequel.rb

@@ -25,6 +25,10 @@ module Sequel #:nodoc:
     end
     
     alias_method :open, :connect
+    
+    def single_threaded=(value)
+      Database.single_threaded = value
+    end
   end
 end
 

data/lib/sequel/mysql.rb

@@ -126,16 +126,24 @@ module Sequel
     end
     
     class Dataset < Sequel::Dataset
+      FIELD_EXPR_RE = /^([^\(]+\()?([^\.]+\.)?([^\s\)]+)(\))?(\s[Aa][Ss]\s(.+))?$/.freeze
+      FIELD_ORDER_RE = /^(.*) (DESC|ASC)$/.freeze
+      FIELD_NOT_QUOTABLE_RE = /^(`(.+)`)|\*$/.freeze
+
+      def quote_field(field)
+        field =~ FIELD_NOT_QUOTABLE_RE ? field : "`#{field}`"
+      end
+      
       def field_name(field)
         f = field.is_a?(Symbol) ? field.to_field_name : field
-        if f =~ /^(([^\(]*)\(\*\))|\*$/
-          f
-        elsif f =~ /^([^\(]*)\(([^\*\)]*)\)$/
-          "#{$1}(`#{$2}`)"
-        elsif f =~ /^(.*) (DESC|ASC)$/
-          "`#{$1}` #{$2}"
+        case f
+        when FIELD_EXPR_RE:
+          $6 ? \
+            "#{$1}#{$2}#{quote_field($3)}#{$4} AS #{quote_field($6)}" : \
+            "#{$1}#{$2}#{quote_field($3)}#{$4}"
+        when FIELD_ORDER_RE: "#{quote_field($1)} #{$2}"
         else
-          "`#{f}`"
+          quote_field(f)
         end
       end
 

data/spec/adapters/mysql_spec.rb

@@ -78,9 +78,21 @@ context "A MySQL dataset" do
     @d.select(:value.MAX).sql.should == \
       'SELECT max(`value`) FROM items'
 
+    @d.select(:items__value.MAX).sql.should == \
+      'SELECT max(items.`value`) FROM items'
+
     @d.order(:name.DESC).sql.should == \
       'SELECT * FROM items ORDER BY `name` DESC'
       
+    @d.select('items.name AS item_name').sql.should == \
+      'SELECT items.`name` AS `item_name` FROM items'
+      
+    @d.select('`name`').sql.should == \
+      'SELECT `name` FROM items'
+
+    @d.select('max(items.`name`) as `max_name`').sql.should == \
+      'SELECT max(items.`name`) AS `max_name` FROM items'
+
     @d.insert_sql(:value => 333).should == \
       'INSERT INTO items (`value`) VALUES (333)'
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
-date: 2007-07-21 00:00:00 +03:00
+  version: 0.1.9.1
+date: 2007-07-22 00:00:00 +03:00
 summary: Concise ORM for Ruby.
 require_paths: 
 - lib