sql-maker 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913d95f6a4b16c768820651f43606bad4a1e6d48
-  data.tar.gz: a9a05ffd8835ac0626bfc69f440df1f666f25c8e
+  metadata.gz: 32ac24cfad827c72f15a9d677d0c7ea6a68317a2
+  data.tar.gz: 51e81c781768b04148522f9408777dd532b4c62b
 SHA512:
-  metadata.gz: aeb4c999c4a6482778cf33c1a4434c6e3bbcfd9562e14c07873a5da7dd700dbe0d380d0b0bd223df094ce5e1463a36ad9db2d9e59ef953bbf67ca6f9cba61d19
-  data.tar.gz: ce05861fe69d9aa7557b1b0491a5f2191ed711ad2435467a9b2edc1debee6a98e17f4845c68bfb7400eae6f8014c48654675ef1400100b0fe49c9ce120763968
+  metadata.gz: 029d20d44324f0e04c82a68556301dfb31b18e09c3f2e633e9e00f3ab450dddccd8b04fb715af57e489d5bdb2aa81b5dc32980484037170cc2b6d9dfc381965b
+  data.tar.gz: 30e4544a8d797d4b36dd0bde3bd6d342ce9b1d7ca9e63c510930b5d97d5aef298a5f92752d49ac877879f82eacbf86ae1fe0bc5c840f05ca04401e6139961b85

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.2 (2014/06/18)
+
+Enhancements:
+
+* Add default :quote_char, :name_sep for SQL::Maker::Select, and SQL::Maker::Condition
+* Add auto_bind option to SQL::Maker::Condition
+* Inherit SQL::Maker::Condition parameters on creating sub conditions
+
 ## 0.0.1 (2014/06/18)
 
 First version

data/lib/sql/maker.rb

@@ -20,7 +20,7 @@ class SQL::Maker
     end
     unless @quote_char = args[:quote_char]
       @quote_char =
-        if driver.to_s == 'mysql'
+        if @driver == 'mysql'
           %q{`}
         else
           %q{"}
@@ -28,7 +28,7 @@ class SQL::Maker
     end
     @select_class = @driver == 'oracle' ? SQL::Maker::Select::Oracle : SQL::Maker::Select
 
-    @name_sep = args[:name_sep] || ','
+    @name_sep = args[:name_sep] || '.'
     @new_line = args[:new_line] || "\n"
     @strict = args[:strict] || false
     @auto_bind = args[:auto_bind] || false # apply client-side prepared statement binding autocatically

data/lib/sql/maker/condition.rb

@@ -3,14 +3,25 @@ require 'sql/query_maker'
 
 class SQL::Maker::Condition
   include SQL::Maker::Util
-  attr_accessor :sql, :bind, :strict, :name_sep, :quote_char
+  attr_accessor :quote_char, :name_sep, :strict, :auto_bind
+  attr_accessor :sql, :bind
 
   def initialize(args = {})
+    @quote_char = args[:quote_char] || ''
+    @name_sep = args[:name_sep] || '.'
+    @strict = args[:strict] || false
+    @auto_bind = args[:auto_bind] || false
+
     @sql = args[:sql] || []
     @bind = args[:bind] || []
-    @strict = args[:strict].nil? ? false : args[:strict]
-    @name_sep = args[:name_sep] || ''
-    @quote_char = args[:quote_char] || ''
+  end
+
+  def new_condition(args = {})
+    SQL::Maker::Condition.new({
+      :quote_char => self.quote_char,
+      :name_sep   => self.name_sep,
+      :strict     => self.strict,
+    }.merge(args))
   end
 
   def &(other)
@@ -125,21 +136,21 @@ class SQL::Maker::Condition
   def compose_and(other)
     if self.sql.empty?
       if other.sql.empty?
-        return SQL::Maker::Condition.new
+        return new_condition
       end
-      return SQL::Maker::Condition.new(
+      return new_condition(
         :sql => ['(' + other.as_sql() + ')'],
         :bind => other.bind,
       )
     end
     if other.sql.empty?
-      return SQL::Maker::Condition.new(
+      return new_condition(
         :sql => ['(' + self.as_sql() + ')'],
         :bind => self.bind,
       )
     end
 
-    return SQL::Maker::Condition.new(
+    return new_condition(
       :sql => ['(' + self.as_sql() + ') AND (' + other.as_sql() + ')'],
       :bind => self.bind + other.bind,
     )
@@ -148,15 +159,15 @@ class SQL::Maker::Condition
   def compose_or(other)
     if self.sql.empty?
       if other.sql.empty?
-        return SQL::Maker::Condition.new
+        return new_condition
       end
-      return SQL::Maker::Condition.new(
+      return new_condition(
         :sql => ['(' + other.as_sql() + ')'],
         :bind => other.bind,
       )
     end
     if other.sql.empty?
-      return SQL::Maker::Condition.new(
+      return new_condition(
         :sql => ['(' + self.as_sql() + ')'],
         :bind => self.bind,
       )
@@ -164,16 +175,16 @@ class SQL::Maker::Condition
 
     # return value is enclosed with '()'.
     # because 'OR' operator priority less than 'AND'.
-    return SQL::Maker::Condition.new(
+    return new_condition(
       :sql => ['((' + self.as_sql() + ') OR (' + other.as_sql() + '))'],
       :bind => self.bind + other.bind,
     )
   end
 
   def as_sql
-    self.sql.join(' AND ')
+    sql = self.sql.join(' AND ')
+    @auto_bind ? bind_param(sql, self.bind) : sql
   end
-  alias_method :to_s, :as_sql
 end
 
 __END__

data/lib/sql/maker/select.rb

@@ -9,6 +9,12 @@ class SQL::Maker::Select
     :index_hint, :group_by, :order_by, :where, :having, :for_update, :subqueries
 
   def initialize(args = {})
+    @quote_char = args[:quote_char] || ''
+    @name_sep = args[:name_sep] || '.'
+    @new_line = args[:new_line] || "\n"
+    @strict = args[:strict] || false
+    @auto_bind = args[:auto_bind] || false
+
     @select = args[:select] || []
     @distinct = args[:distinct] || false
     @select_map = args[:select_map] || {}
@@ -19,16 +25,11 @@ class SQL::Maker::Select
     @group_by = args[:group_by] || []
     @order_by = args[:order_by] || []
     @prefix = args[:prefix] || 'SELECT '
-    @new_line = args[:new_line] || "\n"
-    @strict = args[:strict] || false
-    @auto_bind = args[:auto_bind] || false
     @where = args[:where]
     @having = args[:having]
     @limit = args[:limit]
     @offset = args[:offset]
     @for_update = args[:for_update]
-    @quote_char = args[:quote_char]
-    @name_sep = args[:name_sep]
     @subqueries = []
   end
 

data/spec/maker/bind_param_spec.rb

@@ -60,3 +60,25 @@ describe 'SQL::Maker' do
     end
   end
 end
+
+describe 'SQL::Maker::Select' do
+  let(:builder) { SQL::Maker::Select.new(:auto_bind => true, :new_line => ' ') }
+
+  it 'auto bind' do
+    sql = builder
+      .add_select('foo')
+      .add_from('table')
+      .add_where('hoge' => "t' OR 't' = 't")
+      .as_sql
+    expect(sql).to be == %q{SELECT foo FROM table WHERE (hoge = 't'' OR ''t'' = ''t')}
+  end
+end
+
+describe 'SQL::Maker::Condition' do
+  let(:builder) { SQL::Maker::Condition.new(:auto_bind => true) }
+
+  it 'auto bind' do
+    sql = builder.add('hoge' => "t' OR 't' = 't").as_sql
+    expect(sql).to be == %q{(hoge = 't'' OR ''t'' = ''t')}
+  end
+end

data/sql-maker.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sql-maker"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Naotoshi Seo"]
   spec.email         = ["sonots@gmail.com"]
   spec.summary       = %q{SQL Builder for Ruby}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sql-maker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi Seo