fluent-query-dbi 0.9.1 → 0.9.2

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-   gem "fluent-query-sql", ">= 0.9.0"
-   gem "fluent-query", ">= 0.9.0"
+   gem "fluent-query-sql", ">= 0.9.2"
+   gem "fluent-query", ">= 0.9.2"
    gem "abstract", ">= 1.0.0"
    gem "hash-utils", ">= 0.18.0"
    gem "dbi", ">= 0.4.5"
@@ -11,12 +11,5 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "bundler", ">= 1.0.13"
-  gem "jeweler", ">= 1.6.0"
+  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

@@ -5,22 +5,19 @@ GEM
     dbi (0.4.5)
       deprecated (= 2.0.1)
     deprecated (2.0.1)
-    fluent-query (0.9.1)
+    fluent-query (0.9.3)
       abstract (>= 1.0.0)
       hash-utils (>= 0.18.0)
-      hashie (>= 1.0.0)
-    fluent-query-sql (0.9.1)
+    fluent-query-sql (0.9.2)
       abstract (>= 1.0.0)
-      fluent-query (>= 0.9.0)
+      fluent-query (>= 0.9.2)
       hash-utils (>= 0.18.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
@@ -29,7 +26,7 @@ DEPENDENCIES
   abstract (>= 1.0.0)
   bundler (>= 1.0.13)
   dbi (>= 0.4.5)
-  fluent-query (>= 0.9.0)
-  fluent-query-sql (>= 0.9.0)
+  fluent-query (>= 0.9.2)
+  fluent-query-sql (>= 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-dbi/issues

data/Rakefile

@@ -11,7 +11,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-dbi.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fluent-query-dbi}
-  s.version = "0.9.1"
+  s.name = "fluent-query-dbi"
+  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-15}
-  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"
@@ -28,40 +28,40 @@ Gem::Specification.new do |s|
     "lib/fluent-query/drivers/dbi/prepared.rb",
     "lib/fluent-query/drivers/shared/results/dbi.rb"
   ]
-  s.homepage = %q{http://github.com/martinkozak/fluent-query-dbi}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Generic DBI 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-dbi"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Generic DBI 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
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fluent-query-sql>, [">= 0.9.0"])
-      s.add_runtime_dependency(%q<fluent-query>, [">= 0.9.0"])
+      s.add_runtime_dependency(%q<fluent-query-sql>, [">= 0.9.2"])
+      s.add_runtime_dependency(%q<fluent-query>, [">= 0.9.2"])
       s.add_runtime_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_runtime_dependency(%q<dbi>, [">= 0.4.5"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.13"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.0"])
+      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
     else
-      s.add_dependency(%q<fluent-query-sql>, [">= 0.9.0"])
-      s.add_dependency(%q<fluent-query>, [">= 0.9.0"])
+      s.add_dependency(%q<fluent-query-sql>, [">= 0.9.2"])
+      s.add_dependency(%q<fluent-query>, [">= 0.9.2"])
       s.add_dependency(%q<abstract>, [">= 1.0.0"])
       s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
       s.add_dependency(%q<dbi>, [">= 0.4.5"])
       s.add_dependency(%q<bundler>, [">= 1.0.13"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.0"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     end
   else
-    s.add_dependency(%q<fluent-query-sql>, [">= 0.9.0"])
-    s.add_dependency(%q<fluent-query>, [">= 0.9.0"])
+    s.add_dependency(%q<fluent-query-sql>, [">= 0.9.2"])
+    s.add_dependency(%q<fluent-query>, [">= 0.9.2"])
     s.add_dependency(%q<abstract>, [">= 1.0.0"])
     s.add_dependency(%q<hash-utils>, [">= 0.18.0"])
     s.add_dependency(%q<dbi>, [">= 0.4.5"])
     s.add_dependency(%q<bundler>, [">= 1.0.13"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.0"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
   end
 end
 

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

@@ -1,8 +1,6 @@
 # encoding: utf-8
 require "abstract"
-require "hash-utils/object"   # >= 0.17.0
-require "hash-utils/array"
-require "hash-utils/hash"
+require "hash-utils"   # >= 0.17.0
 
 require "fluent-query/drivers/sql"
 require "fluent-query/drivers/exception"
@@ -32,6 +30,24 @@ module FluentQuery
                 super(connection)
             end
             
+            ##
+            # Indicates, method is relevant for the driver.
+            #
+            # @since 0.9.2
+            # @abstract
+            #
+
+            public
+            def relevant_method?(name)
+                if name.start_with? "prepare_"
+                    _name = name[8..-1].to_sym
+                else
+                    _name = name
+                end
+                
+                super(_name)
+            end
+            
             ##
             # Returns preparation placeholder.
             #
@@ -188,6 +204,67 @@ module FluentQuery
             def prepare(query)
                 DBI::Prepared::new(self, query)
             end
+                                
+            ##
+            # Checks query conditionally. It's called after first token
+            # of the query.
+            #
+            # @see FluentQuery::Drivers::SQL#execute_conditionally
+            # @see #prepare_conditionally
+            # @since 0.9.2
+            #
+            
+            public
+            def check_conditionally(query, sym, *args, &block)
+                if sym.start_with? "prepare_" 
+                    self.prepare_conditionally(query, sym, *args, &block)
+                else
+                    super(query, sym, *args, &block)
+                end
+            end
+            
+            ##
+            # Prepares query conditionally.
+            #
+            # If query isn't suitable for preparing, returns it. In otherwise
+            # returns +nil+, result or number of changed rows.
+            # 
+            # @since 0.9.2
+            #
+
+            public
+            def prepare_conditionally(query, sym, *args, &block)
+                case query.type
+                    when :insert
+                        if (args.first.symbol?) and (args.second.hash?)
+                            result = query.prepare!
+                        end
+                    when :truncate
+                        if args.first.symbol?
+                            result = query.prepare!
+                        end
+                    else
+                        result = nil
+                end
+                
+                return result
+            end
+            
+            ##
+            # Corrects token before it's pushed to the token. So allows to
+            # modify data assigned to the query from driver level.
+            #
+            # @since 0.9.2
+            #
+            
+            public
+            def correct_token(name, args)
+                if name.start_with? "prepare_" 
+                    name = name[8..-1].to_sym
+                end
+                
+                return [name, args]
+            end
             
         end
     end

data/lib/fluent-query/drivers/dbi/prepared.rb

@@ -68,11 +68,11 @@ module FluentQuery
                 
                 def prepared
                     if @prepared.nil?
-                        string = @driver.build_query(@query, :compile)
+                        string = @driver.build_query(@query, :prepare)
                         string.gsub!(self.matcher, '?\1')
                         @prepared = string
                     end
-                    
+#p @prepared
                     @prepared
                 end
                 

data/lib/fluent-query/drivers/shared/results/dbi.rb

@@ -29,6 +29,12 @@ module FluentQuery
                     protected
                     @@_sources = { }
                     
+                    ##
+                    # Holds column names cache.
+                    #
+                    
+                    @@column_names = nil
+                    
                     ##
                     # Initializes result.
                     #
@@ -72,9 +78,10 @@ module FluentQuery
                     public
                     def one
                         row = @_source.fetch_hash
-
+                        
                         if row
-                            result = FluentQuery::Data[row]
+                            row = row.map_keys { |i| i.to_sym }
+                            result = FluentQuery::Data::new(row)
                         else
                             result = nil
                         end
@@ -126,6 +133,19 @@ module FluentQuery
                     def each(&block)
                         self.hash &block
                     end
+                    
+                    ##
+                    # Returns the column names.
+                    #
+                    
+                    public
+                    def column_names
+                        if @@column_names.nil?
+                            @@column_names = @_source.column_names.map { |i| i.to_sym }
+                        end
+                        
+                        @@column_names
+                    end
 
                     ##
                     # Repeats the query leaded to the result.
@@ -133,8 +153,8 @@ module FluentQuery
 
                     public
                     def repeat!
-                        @_source.execute
-                        return self
+                        @_source.execute()
+                        self
                     end
 
                     ##

metadata

@@ -1,104 +1,136 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fluent-query-dbi
-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-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fluent-query-sql
-  requirement: &id001 !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: *id001
-- !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: fluent-query
-  requirement: &id002 !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: *id002
-- !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: abstract
-  requirement: &id003 !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: *id003
-- !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: hash-utils
-  requirement: &id004 !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: *id004
-- !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: dbi
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id006 !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: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.6.0
+    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: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  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
@@ -111,34 +143,32 @@ files:
 - lib/fluent-query/drivers/dbi/prepared.rb
 - lib/fluent-query/drivers/shared/results/dbi.rb
 homepage: http://github.com/martinkozak/fluent-query-dbi
-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: -1693757158765774675
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -707879157469416614
+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 DBI 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 DBI 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: []
-