sqlstmt 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43fd727a94cc45f31164bb9e03eb4bd196cd8e66128c49f329681848fb20f940
-  data.tar.gz: b036810fd8b283550a0a5dc9af3ee7f876a30b0433cb7fe41fc0c34c3242e26d
+  metadata.gz: da75fc21521c962370ecfb05b8a2eefeffe08c27a3d3e74d3c8162de45e18870
+  data.tar.gz: 36240342fd174f6d35da9fc3232f71f36c7cf96ab30f64adfc6d1f3809604ae5
 SHA512:
-  metadata.gz: bcaffe414f5c51d43f56b13ecee6162528d71ed8fd398763ade58ca85c1585138421ea146569340bd76fbde282dbde5beeddde9c53cf5c392bb5ae65c0578f08
-  data.tar.gz: 2d9a4a5fbf44216eba1f9fa03385ea29c0f9e86eed147e7483632c35534716a406bae2b5b74492eb5e1b4029595326f94d4bcb334484959986518c6bb2edb460
+  metadata.gz: 4b76f9db91f918f54229ab0bb5fff5820ee3559649a9fea0f8a307f9329d8502737139b1ae046b42f2c1e354135f13fc47bded74520f29313a813425f3e2253a
+  data.tar.gz: d7749cf573be6bfa522d3efa817f9a90e04095d38be98271e9abe1435ce965a4c665ee58eb38ccfd9a70834cdcd063341626cd7c25068936f7046848001fd6ca

data/lib/sqlstmt/data.rb

@@ -20,7 +20,7 @@ SqlTable = Struct.new(:str, :name, :alias, :index)
 SqlJoin = Struct.new(:kwstr, :table, :on_expr)
 
 # :table_ids is a set of all table names and aliases, including ones added by a join
-SPECIAL_DATA_FIELDS = %i(stmt_type table_ids where_behavior).freeze
+SPECIAL_DATA_FIELDS = %i(stmt_type table_ids where_behavior values_clause values_alias).freeze
 ARRAY_DATA_FIELDS = MULTI_VALUE_KEYWORDS.map {|keyword| "#{keyword}s".to_sym} + %i(tables joins set_fields set_values tables_to_delete).freeze
 
 # calling uniq on this in case some fields end up in multiple categories

data/lib/sqlstmt/mysql/build.rb

@@ -58,7 +58,12 @@ class MysqlBuilder
       field_list = @data.set_fields.join(',')
       parts << "(#{field_list})"
     end
-    parts << shared_select(@data.set_values)
+    if @data.values_clause
+      parts << "VALUES (#{@data.set_values.join(',')})"
+      parts << "AS #{@data.values_alias}" if @data.values_alias
+    else
+      parts << shared_select(@data.set_values)
+    end
     if @data.on_duplicate
       parts << "ON DUPLICATE KEY UPDATE #{@data.on_duplicate}"
     elsif @data.ignore_duplicate

data/lib/sqlstmt/mysql/check.rb

@@ -10,7 +10,7 @@ class MysqlChecker
 
   def run
     check_basics
-    check_where
+    check_where if !@data.tables.empty?
     check_statement_type_specific
   end
 
@@ -18,7 +18,10 @@ class MysqlChecker
     if !@data.stmt_type
       raise SqlStmtError, "must call :select, :update, :insert or :delete"
     end
-    if @data.tables.empty?
+    if @data.values_clause
+      raise SqlStmtError, "must not call :values on #{@data.stmt_type} statement" if @data.stmt_type != 'insert'
+      raise SqlStmtError, "must not call :table with :values" if !@data.tables.empty?
+    elsif @data.tables.empty?
       raise SqlStmtError, "must call :table"
     end
   end
@@ -52,6 +55,16 @@ class MysqlChecker
   def check_stmt_insert
     raise SqlStmtError, "must call :set on insert statement" if @data.set_values.empty?
     raise SqlStmtError, "must call :into on insert statement" if @data.into.nil?
+    check_values_clause if @data.values_clause
+  end
+
+  def check_values_clause
+    %i(where join having).each do |clause|
+      raise SqlStmtError, "must not call :#{clause} with :values" if !@data["#{clause}s"].empty?
+    end
+    %i(group_by order_by limit offset outfile distinct straight_join with_rollup).each do |field|
+      raise SqlStmtError, "must not call :#{field} with :values" if @data[field]
+    end
   end
 
   def check_stmt_delete

data/lib/sqlstmt/sqlstmt.rb

@@ -135,6 +135,12 @@ class SqlStmt
     return set(field, value.to_sql)
   end
 
+  def values(values_alias = nil)
+    @data.values_clause = true
+    @data.values_alias = values_alias
+    return self
+  end
+
   ###### these are simple wrappers around various keywords
 
   SqlStmtLib::FLAG_KEYWORDS.each do |keyword|

data/test/insert_values_test.rb

@@ -0,0 +1,57 @@
+require_relative 'helper'
+
+class TestInsertValues < Minitest::Test
+  def test_minimum_requirements
+    assert_raises(SqlStmtError) { SqlStmt.new.insert.into('target').values.to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.insert.into('target').set('blah', 'blee').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.insert.into('target').values.set('blah', 'blee').table('source').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.select.values.get('blah').to_s }
+    assert_raises(SqlStmtError) { SqlStmt.new.update.table('target').values.set('blah', 'blee').no_where.to_s }
+  end
+
+  def test_simple
+    assert_equal('INSERT INTO target (blah) VALUES (blee)', SqlStmt.new.insert.into('target').values.set('blah', 'blee').to_s)
+    assert_equal("INSERT INTO target (duration,blah) VALUES (5,'blee')", SqlStmt.new.insert.into('target').values.set('duration', 5).setq('blah', 'blee').to_s)
+    assert_equal('INSERT IGNORE INTO target (blah) VALUES (blee)', SqlStmt.new.insert.ignore.into('target').values.set('blah', 'blee').to_s)
+    assert_equal('REPLACE INTO target (blah) VALUES (blee)', SqlStmt.new.insert.replace.into('target').values.set('blah', 'blee').to_s)
+    assert_equal('INSERT INTO target (blah) VALUES (blee) AS new', SqlStmt.new.insert.into('target').values('new').set('blah', 'blee').to_s)
+  end
+
+  def test_ignore_duplicate
+    sqlt = SqlStmt.new.insert.into('target').values.set('idkey', 1)
+    assert_equal('INSERT INTO target (idkey) VALUES (1) ON DUPLICATE KEY UPDATE idkey = idkey', sqlt.dup.ignore_duplicate('idkey').to_s)
+    assert_equal('INSERT INTO target (idkey) VALUES (1) ON DUPLICATE KEY UPDATE idkey = idkey + 1', sqlt.dup.on_duplicate('idkey = idkey + 1').to_s)
+  end
+
+  def test_values_alias
+    sqlt = SqlStmt.new.insert.into('target').values('new')
+    sqlt.set('idkey', 1).setq('blah', 'blee')
+    sqlt.on_duplicate('blah = new.blah')
+    assert_equal("INSERT INTO target (idkey,blah) VALUES (1,'blee') AS new ON DUPLICATE KEY UPDATE blah = new.blah", sqlt.to_s)
+  end
+
+  def test_from_clauses_rejected
+    sqlt = SqlStmt.new.insert.into('target').values.set('blah', 'blee')
+    assert_raises(SqlStmtError) { sqlt.dup.where('blah = 1').to_s }
+    assert_raises(SqlStmtError) { sqlt.dup.join('other_tbl o', 'o.blah = 1').to_s }
+    assert_raises(SqlStmtError) { sqlt.dup.having('blah > 1').to_s }
+    assert_raises(SqlStmtError) { sqlt.dup.group_by('blah').to_s }
+    assert_raises(SqlStmtError) { sqlt.dup.order_by('blah').to_s }
+    assert_raises(SqlStmtError) { sqlt.dup.limit(1).to_s }
+    assert_raises(SqlStmtError) { sqlt.dup.distinct.to_s }
+  end
+
+  def test_dup
+    shared_builder = SqlStmt.new.insert.into('target').values
+    first_builder = shared_builder
+    other_builder = shared_builder.dup
+
+    first_builder.set('created_at', 'NOW()')
+
+    other_builder.set('info', 'then')
+    other_builder.setq('status', 'good')
+
+    assert_equal('INSERT INTO target (created_at) VALUES (NOW())', first_builder.to_s)
+    assert_equal("INSERT INTO target (info,status) VALUES (then,'good')", other_builder.to_s)
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - ATPSoft
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Build SQL statements using method calls instead of strings. This is not
   an ORM. It has only been used and tested with MySQL so far but the intention is
@@ -33,6 +32,7 @@ files:
 - test/delete_test.rb
 - test/helper.rb
 - test/insert_select_test.rb
+- test/insert_values_test.rb
 - test/select_test.rb
 - test/to_sql_test.rb
 - test/update_test.rb
@@ -40,7 +40,6 @@ homepage: https://github.com/atpsoft/sqlstmt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -55,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
-signing_key: 
+rubygems_version: 4.0.17
 specification_version: 4
 summary: build SQL statements using method calls instead of strings
 test_files:
@@ -64,6 +62,7 @@ test_files:
 - test/delete_test.rb
 - test/helper.rb
 - test/insert_select_test.rb
+- test/insert_values_test.rb
 - test/select_test.rb
 - test/to_sql_test.rb
 - test/update_test.rb