sqlstmt 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be9ad2f845f1232665d90055dce82ff06cee0339
-  data.tar.gz: 23b36babca7556403e80a85f64d87117bd0afc39
+  metadata.gz: b144b236ba23d79ce8976b26ef2b97e6606b380c
+  data.tar.gz: 8aa6ab17ea45dbb8955644f8cc643cb1bac9ac81
 SHA512:
-  metadata.gz: a411a366d8aad05c009a1dbdd8adb436d96f2f368be14e7f6169e54ff13121f4e15e689295602093ce30b19721a4de8355adbf0b7bca93c61b9e1bdbf4c1015f
-  data.tar.gz: c1fdf90de136162338a5f2ba580adc40d62d1b1f7acbf1466f09fd9931e6e702da84f4552865ca210a0c516869afcbb96de194a579670261fb7674a1d655bba7
+  metadata.gz: 3ce0433a3f12680d3873654c25d5c5e4347a9a329e54ba906ac4fa69de3304791bd0b6237e824b56b5ca82aa601551028417b153f293e687e582efe71b94818e
+  data.tar.gz: fcaa33fcdb9e95c3f167a9823e094c7ef8516e11fd0841efd741e183298dd07d1d57fcdb8d918bac576971aecfcb2ca5e2ad9ff9b16714464e4c27b06f7a314a

data/lib/sqlstmt/sqlstmt.rb

@@ -24,6 +24,8 @@ class SqlStmt
     @replace = nil
     @ignore = ''
     @outfile = ''
+    # track this explicitly to guarantee get is not used with non-select statements
+    @called_get = false
   end
 
   def initialize_copy(orig)
@@ -96,6 +98,7 @@ class SqlStmt
 
   def get(*exprs)
     @fields.concat(exprs)
+    @called_get = true
     return self
   end
 
@@ -223,7 +226,8 @@ private
   def verify_minimum_requirements
     if !@stmt_type
       raise SqlStmtError, "unable to build sql - must call :select, :update, :insert or :delete to specify statement type"
-    elsif @tables.empty?
+    end
+    if @tables.empty?
       raise SqlStmtError, "unable to build sql - must call :table"
     end
 
@@ -235,12 +239,22 @@ private
 
     if @stmt_type == 'select'
       raise SqlStmtError, "unable to build sql - must call :get" if @fields.empty?
-    elsif @stmt_type == 'update'
+      raise SqlStmtError, "unable to build sql - must not call :set" if !@values.empty?
+    else
+      raise SqlStmtError, "unable to build sql - must not call :get" if @called_get
+    end
+
+    if ['update','insert'].include?(@stmt_type)
       raise SqlStmtError, "unable to build sql - must call :set or :setq" if @fields.empty?
-    elsif @stmt_type == 'insert'
+      raise SqlStmtError, "unable to build sql - must not call :get" if @called_get
+    end
+
+    if @stmt_type == 'insert'
       raise SqlStmtError, "unable to build sql - must call :into" if @into_table.nil?
-      raise SqlStmtError, "unable to build sql - must call :set or :setq" if @fields.empty?
-    elsif @stmt_type == 'delete'
+    end
+
+    if @stmt_type == 'delete'
+      raise SqlStmtError, "unable to build sql - must not call :get or :set" if !@fields.empty?
       if @tables_to_delete.empty? && ((@tables.size + @joins.size) > 1)
         raise SqlStmtError, "unable to build sql - must specify tables to delete when including multiple tables"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies: []
 description: build SQL statements in a modular fashion, one piece at a time; only
   used/tested with MySQL so far