fluent-query-sql 0.9.1 → 0.9.2

data/Gemfile

@@ -3,20 +3,11 @@ source "http://rubygems.org"
 # Example:
    gem "hash-utils", ">= 0.18.0"
    gem "abstract", ">= 1.0.0"
-   gem "fluent-query", ">= 0.9.0"
+   gem "fluent-query", ">= 0.9.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "bundler", "~> 1.0.13"
-  gem "jeweler", "~> 1.6.0"
+  gem "bundler", ">= 1.0.13"
+  gem "jeweler2", ">= 2.0.0"
 end
-
-
-
-# fluent-query-sql
-# fluent-query-dbh
-# fluent-query-mysql
-# fluent-query-sqlite
-# fluent-query-postgresql
-# native-query

data/Gemfile.lock

@@ -2,25 +2,22 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    fluent-query (0.9.0)
+    fluent-query (0.9.3)
       abstract (>= 1.0.0)
       hash-utils (>= 0.18.0)
-      hashie (>= 1.0.0)
     git (1.2.5)
-    hash-utils (0.18.0)
-    hashie (1.0.0)
-    jeweler (1.6.3)
-      bundler (~> 1.0)
+    hash-utils (2.0.0)
+      ruby-version
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    rake (0.9.2)
+    ruby-version (0.3.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   abstract (>= 1.0.0)
-  bundler (~> 1.0.13)
-  fluent-query (>= 0.9.0)
+  bundler (>= 1.0.13)
+  fluent-query (>= 0.9.2)
   hash-utils (>= 0.18.0)
-  jeweler (~> 1.6.0)
+  jeweler2 (>= 2.0.0)

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2009 - 2011 Martin Kozák (martinkozak@martinkozak.net)
+Copyright (c) 2009 - 2012 Martin Kozák (martinkozak@martinkozak.net)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -23,7 +23,7 @@ Contributing
 Copyright
 ---------
 
-Copyright © 2009-2011 [Martin Kozák][3]. See `LICENSE.txt` for
+Copyright © 2009-2012 [Martin Kozák][3]. See `LICENSE.txt` for
 further details.
 
 [2]: http://github.com/martinkozak/fluent-query-sql/issues

data/Rakefile

@@ -12,7 +12,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/fluent-query-sql.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fluent-query-sql}
-  s.version = "0.9.1"
+  s.name = "fluent-query-sql"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Martin Kozák}]
-  s.date = %q{2011-07-14}
-  s.email = %q{martinkozak@martinkozak.net}
+  s.authors = ["Martin Koz\u{e1}k"]
+  s.date = "2012-05-30"
+  s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -41,11 +41,11 @@ Gem::Specification.new do |s|
     "lib/fluent-query/drivers/sql.rb",
     "lib/fluent-query/queries/sql.rb"
   ]
-  s.homepage = %q{http://github.com/martinkozak/fluent-query-sql}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Generic SQL support for the Fluent Query. Fluent Query is cool way how to write SQL queries in Ruby. Contains base libraries used by specific SQL driver.}
+  s.homepage = "http://github.com/martinkozak/fluent-query-sql"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Generic SQL support for the Fluent Query. Fluent Query is cool way how to write SQL queries in Ruby. Contains base libraries used by specific SQL driver."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -53,22 +53,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_runtime_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<fluent-query>, [">= 0.9.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.13"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_runtime_dependency(%q<fluent-query>, [">= 0.9.2"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.13"])
+      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
     else
       s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_dependency(%q<fluent-query>, [">= 0.9.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.13"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+      s.add_dependency(%q<fluent-query>, [">= 0.9.2"])
+      s.add_dependency(%q<bundler>, [">= 1.0.13"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     end
   else
     s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
     s.add_dependency(%q<abstract>, [">= 1.0.0"])
-    s.add_dependency(%q<fluent-query>, [">= 0.9.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.13"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
+    s.add_dependency(%q<fluent-query>, [">= 0.9.2"])
+    s.add_dependency(%q<bundler>, [">= 1.0.13"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
   end
 end
 

data/lib/fluent-query/drivers/shared/tokens/sql/insert.rb

@@ -30,6 +30,7 @@ module FluentQuery
 
                                 # INSERT token
                                 if token.name == :insert
+                                    values = arguments.second.values
 
                                     # Checks for arguments
                                     if (not arguments.first.symbol?) or (not arguments.second.hash?)
@@ -39,7 +40,20 @@ module FluentQuery
                                     # Process
                                     table = processor.quote_identifier(arguments.first)
                                     fields = processor.process_identifiers(arguments.second.keys)
-                                    values = processor.process_array(arguments.second.values)
+                                    
+                                    if mode == :prepare
+                                        values = values.map do |item|
+                                            if item != ??
+                                                processor.quote_value(i)
+                                            else
+                                                item
+                                            end
+                                        end
+                                        
+                                        values = values.join(', ')
+                                    else
+                                        values = processor.process_array(values)
+                                    end
                                     
                                     result << table << " (" << fields << ") VALUES (" << values << ")"
 

data/lib/fluent-query/drivers/sql.rb

@@ -1,8 +1,10 @@
 # encoding: utf-8
+require "set"
 require "abstract"
 require "hash-utils/module"   # >= 0.13.0
 require "hash-utils/string"   # >= 0.15.0
 require "hash-utils/array"    # >= 0.17.0
+require "hash-utils/object"   # >= 0.8.0
 
 require "fluent-query/driver"
 require "fluent-query/queries/sql"
@@ -21,7 +23,7 @@ module FluentQuery
             # Contains relevant methods index for this driver.
             #
                 
-            RELEVANT = [:select, :insert, :update, :delete, :truncate, :set, :begin, :commit, :union, :rollback]
+            RELEVANT = Set::new [:select, :insert, :update, :delete, :truncate, :set, :begin, :commit, :union, :rollback]
 
             ##
             # Contains ordering for typicall queries.
@@ -67,7 +69,7 @@ module FluentQuery
             # Indicates, appropriate token should be present by one real token, but more input tokens.
             #
 
-            AGREGATE = [:where, :orderBy, :select, :groupBy, :having]
+            AGREGATE = Set::new [:where, :orderBy, :select, :groupBy, :having]
 
             ##
             # Indicates token aliases.
@@ -153,12 +155,8 @@ module FluentQuery
                 @ordering = SQL::ORDERING
                 @operators = SQL::OPERATORS
                 @aliases = SQL::ALIASES
+                @agregate = SQL::AGREGATE
 
-                @agregate = { }
-                SQL::AGREGATE.each do |i| 
-                    @agregate[i] = true
-                end
-                
                 @_tokens_required = { }
             end
             
@@ -170,7 +168,7 @@ module FluentQuery
 
             public
             def relevant_method?(name)
-                @relevant.include? name
+                name.in? @relevant
             end
             
             ##
@@ -196,7 +194,7 @@ module FluentQuery
 
                 return result
                 
-            end                
+            end    
 
             ##
             # Builds given query.
@@ -257,12 +255,12 @@ module FluentQuery
             ##
             # Indicates which query subclass to use.
             #
-
+ 
             public
             def query_class
                 FluentQuery::Queries::SQL
             end
-            
+             
             ##
             # Builds given query.
             #
@@ -340,7 +338,7 @@ module FluentQuery
                     if (name == :__init__) and (not subtokens.nil?)
                         init_tokens = [inittoken_class::new(self, query, subtokens)]
                     
-                    elsif @agregate.has_key? name
+                    elsif name.in? @agregate
                         agregates[name] << data
                         
                     elsif self.known_token? type, name
@@ -441,7 +439,7 @@ module FluentQuery
                 string = string.gsub("'", "''")
                 string.gsub!("\\", "\\\\\\\\")
                 
-                return "'" << string << "'"
+                return "'" + string + "'"
             end
 
             ##
@@ -468,7 +466,7 @@ module FluentQuery
 
             public
             def quote_identifier(field)
-                '"' << field.to_s.gsub(".", '"."') << '"'
+                '"' + field.to_s.gsub(".", '"."') + '"'
             end
 
             ##
@@ -504,7 +502,7 @@ module FluentQuery
 
             public
             def quote_subquery(subquery)
-                "(" << subquery << ")"
+                "(" + subquery + ")"
             end
 
 
@@ -521,12 +519,25 @@ module FluentQuery
             def open_connection(settings)
                 not_implemented
             end
+                                
+            ##
+            # Checks query conditionally. It's called after first token
+            # of the query.
+            #
+            # @see #execute_conditionally
+            # @since 0.9.2
+            #
+            
+            public
+            def check_conditionally(query, sym, *args, &block)
+                self.execute_conditionally(query, sym, *args, &block)
+            end
             
             ##
             # Executes query conditionally.
             #
             # If query isn't suitable for executing, returns it. In otherwise
-            # returns result or number of changed rows.
+            # returns +nil+, result or number of changed rows.
             #
 
             public

data/lib/fluent-query/queries/sql.rb

@@ -36,7 +36,7 @@ module FluentQuery
             #
             
             def processor
-                super()
+                super
             end
             
             ##

metadata

@@ -1,82 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fluent-query-sql
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.2
   prerelease: 
-  version: 0.9.1
 platform: ruby
-authors: 
-- "Martin Koz\xC3\xA1k"
+authors:
+- Martin Kozák
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hash-utils
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.18.0
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+- !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: fluent-query
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.13
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.13
+- !ruby/object:Gem::Dependency
+  name: jeweler2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: 
 email: martinkozak@martinkozak.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -102,34 +124,32 @@ files:
 - lib/fluent-query/drivers/sql.rb
 - lib/fluent-query/queries/sql.rb
 homepage: http://github.com/martinkozak/fluent-query-sql
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3539152250720307305
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2953163305667929305
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Generic SQL support for the Fluent Query. Fluent Query is cool way how to write SQL queries in Ruby. Contains base libraries used by specific SQL driver.
+summary: Generic SQL support for the Fluent Query. Fluent Query is cool way how to
+  write SQL queries in Ruby. Contains base libraries used by specific SQL driver.
 test_files: []
-