jdbc-helper 0.7.4 → 0.7.5

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+### 0.7.5 / 2012/07/28
+* `require 'jdbc-helper/sql'` is allowed in non-Java environments
+
 ### 0.7.4 / 2012/07/09
 * Revised Connectors
  * Use `JDBCHelper::MySQL` instead of `JDBCHelper::MySQLConnector`

data/README.markdown

@@ -249,11 +249,14 @@ table.drop!
 
 #### Building complex where clauses
 ```ruby
-SQL = JDBCHelper::SQL                  # Shortcut. Or you can just include JDBCHelper
+# Shortcut. Or you can just include JDBCHelper
+SQL = JDBCHelper::SQL
 
-# With Hash
+# With any number of Strings, Arrays and Hashes
 scope = table.where(
-  :a => 'abc',                         # a = 'abc'
+  "x <> 'hello'",                      # x <> 'hello'
+  ["y = ? or z > ?", 'abc', 10],       # and (y = 'abc' or z > 10)
+  :a => 'abc',                         # and a = 'abc'
   :b => (1..10),                       # and b >= 1 and b <= 10
   :c => (1...10),                      # and c >= 1 and c < 10
   :d => %w[a b c],                     # and d in ('a', 'b', 'c')
@@ -266,9 +269,6 @@ scope = table.where(
   :k => SQL.le( SQL.expr('sysdate') )  # and k <= sysdate
 )
 scope.update(:a => 'xyz')
-
-# With Array
-scope = table.where(["a = ? or b > ?", 'abc', 10])
 ```
 
 #### Invalid use of dynamic conditions

data/jdbc-helper.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = JDBCHelper::VERSION
 
-  gem.add_runtime_dependency 'insensitive_hash', '~> 0.2.4'
+  gem.add_runtime_dependency 'insensitive_hash', '>= 0.2.4', '< 0.4.0'
   gem.add_development_dependency "bundler", "~> 1.1.4"
   gem.add_development_dependency "rcov", "~> 0.9"
   gem.add_development_dependency "test-unit", ">= 2.3.0"

data/lib/jdbc-helper/sql/expression.rb

@@ -4,7 +4,7 @@
 module JDBCHelper
 # SQL generator class methods for prepared operations.
 # WARNING: Does not perform SQL.check to minimize performance overhead
-class SQL
+module SQL
   # Generate SQL snippet, prevents the string from being quoted.
   # @param [String] SQL snippet
   # @return [JDBCHelper::SQL::Expression]

data/lib/jdbc-helper/sql/sql.rb

@@ -1,6 +1,8 @@
 # encoding: UTF-8
 # Junegunn Choi (junegunn.c@gmail.com)
 
+require 'bigdecimal'
+
 module JDBCHelper
 
 # Generate SQL snippet, prevents the string from being quoted.
@@ -16,7 +18,7 @@ class << self
 end
 
 # Class representing an SQL snippet. Also has many SQL generator class methods.
-class SQL
+module SQL
   # Formats the given data so that it can be injected into SQL
   def self.value data
     case data

data/lib/jdbc-helper/sql/sql_prepared.rb

@@ -4,7 +4,7 @@
 module JDBCHelper
 # SQL generator class methods for prepared operations.
 # WARNING: Does not perform SQL.check to minimize performance overhead
-class SQLPrepared < JDBCHelper::SQL
+module SQLPrepared
   # Generates SQL where cluase with the given conditions.
   # Parameter can be either Hash of String.
   def self.where *conds
@@ -54,7 +54,7 @@ class SQLPrepared < JDBCHelper::SQL
     sql = [
       "select #{opts.fetch(:select, ['*']).join(', ')} from #{table}", 
       w_c.to_s,
-      order(opts.fetch(:order, []).join(', '))
+      SQL.order(opts.fetch(:order, []).join(', '))
     ].reject(&:empty?).join(' ')
 
     return sql, w_b

data/lib/jdbc-helper/sql.rb

@@ -0,0 +1,3 @@
+require 'jdbc-helper/sql/sql'
+require 'jdbc-helper/sql/sql_prepared'
+require 'jdbc-helper/sql/expression'

data/lib/jdbc-helper/version.rb

@@ -1,3 +1,3 @@
 module JDBCHelper
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

data/lib/jdbc-helper.rb

@@ -8,9 +8,7 @@ if RUBY_PLATFORM.match(/java/).nil?
 end
 
 require 'java'
-require 'jdbc-helper/sql/sql'
-require 'jdbc-helper/sql/sql_prepared'
-require 'jdbc-helper/sql/expression'
+require 'jdbc-helper/sql'
 require 'jdbc-helper/constants'
 require 'jdbc-helper/connection'
 require 'jdbc-helper/connector'

metadata

@@ -1,145 +1,166 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jdbc-helper
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.7.4
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.7.5
 platform: ruby
-authors: 
-  - Junegunn Choi
-autorequire: 
+authors:
+- Junegunn Choi
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-07-09 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: insensitive_hash
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 0.2.4
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: bundler
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.1.4
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: rcov
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "0.9"
-    type: :development
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: test-unit
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 2.3.0
-    type: :development
-    version_requirements: *id004
+date: 2012-07-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: insensitive_hash
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rcov
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+    none: false
+  prerelease: false
+  type: :development
 description: A JDBC helper for JRuby/Database developers.
-email: 
-  - junegunn.c@gmail.com
+email:
+- junegunn.c@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - .gitignore
-  - CHANGELOG.markdown
-  - Gemfile
-  - LICENSE.txt
-  - README.markdown
-  - Rakefile
-  - VERSION
-  - jdbc-helper.gemspec
-  - lib/jdbc-helper.rb
-  - lib/jdbc-helper/connection.rb
-  - lib/jdbc-helper/connection/callable_statement.rb
-  - lib/jdbc-helper/connection/parameterized_statement.rb
-  - lib/jdbc-helper/connection/prepared_statement.rb
-  - lib/jdbc-helper/connection/result_set_enumerator.rb
-  - lib/jdbc-helper/connection/row.rb
-  - lib/jdbc-helper/connection/statement_pool.rb
-  - lib/jdbc-helper/connection/type_map.rb
-  - lib/jdbc-helper/connector.rb
-  - lib/jdbc-helper/connector/cassandra.rb
-  - lib/jdbc-helper/connector/mssql.rb
-  - lib/jdbc-helper/connector/mysql.rb
-  - lib/jdbc-helper/connector/oracle.rb
-  - lib/jdbc-helper/connector/postgresql.rb
-  - lib/jdbc-helper/constants.rb
-  - lib/jdbc-helper/sql/expression.rb
-  - lib/jdbc-helper/sql/sql.rb
-  - lib/jdbc-helper/sql/sql_prepared.rb
-  - lib/jdbc-helper/version.rb
-  - lib/jdbc-helper/wrapper/function_wrapper.rb
-  - lib/jdbc-helper/wrapper/object_wrapper.rb
-  - lib/jdbc-helper/wrapper/procedure_wrapper.rb
-  - lib/jdbc-helper/wrapper/sequence_wrapper.rb
-  - lib/jdbc-helper/wrapper/table_wrapper.rb
-  - test/database.yml
-  - test/helper.rb
-  - test/performance.rb
-  - test/test_connection.rb
-  - test/test_connectors.rb
-  - test/test_object_wrapper.rb
-  - test/test_sql.rb
-  - test/testrb
+files:
+- .gitignore
+- CHANGELOG.markdown
+- Gemfile
+- LICENSE.txt
+- README.markdown
+- Rakefile
+- VERSION
+- jdbc-helper.gemspec
+- lib/jdbc-helper.rb
+- lib/jdbc-helper/connection.rb
+- lib/jdbc-helper/connection/callable_statement.rb
+- lib/jdbc-helper/connection/parameterized_statement.rb
+- lib/jdbc-helper/connection/prepared_statement.rb
+- lib/jdbc-helper/connection/result_set_enumerator.rb
+- lib/jdbc-helper/connection/row.rb
+- lib/jdbc-helper/connection/statement_pool.rb
+- lib/jdbc-helper/connection/type_map.rb
+- lib/jdbc-helper/connector.rb
+- lib/jdbc-helper/connector/cassandra.rb
+- lib/jdbc-helper/connector/mssql.rb
+- lib/jdbc-helper/connector/mysql.rb
+- lib/jdbc-helper/connector/oracle.rb
+- lib/jdbc-helper/connector/postgresql.rb
+- lib/jdbc-helper/constants.rb
+- lib/jdbc-helper/sql.rb
+- lib/jdbc-helper/sql/expression.rb
+- lib/jdbc-helper/sql/sql.rb
+- lib/jdbc-helper/sql/sql_prepared.rb
+- lib/jdbc-helper/version.rb
+- lib/jdbc-helper/wrapper/function_wrapper.rb
+- lib/jdbc-helper/wrapper/object_wrapper.rb
+- lib/jdbc-helper/wrapper/procedure_wrapper.rb
+- lib/jdbc-helper/wrapper/sequence_wrapper.rb
+- lib/jdbc-helper/wrapper/table_wrapper.rb
+- test/database.yml
+- test/helper.rb
+- test/performance.rb
+- test/test_connection.rb
+- test/test_connectors.rb
+- test/test_object_wrapper.rb
+- test/test_sql.rb
+- test/testrb
 homepage: https://github.com/junegunn/jdbc-helper
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: A JDBC helper for JRuby/Database developers.
-test_files: 
-  - test/database.yml
-  - test/helper.rb
-  - test/performance.rb
-  - test/test_connection.rb
-  - test/test_connectors.rb
-  - test/test_object_wrapper.rb
-  - test/test_sql.rb
-  - test/testrb
+test_files:
+- test/database.yml
+- test/helper.rb
+- test/performance.rb
+- test/test_connection.rb
+- test/test_connectors.rb
+- test/test_object_wrapper.rb
+- test/test_sql.rb
+- test/testrb
+...