sqlstmt 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7746931f2110ac0ed453789e2374c05b4233ee
-  data.tar.gz: 46c5f8f2a3baa4023d08541c47eb7f45a7fd9cb1
+  metadata.gz: be9ad2f845f1232665d90055dce82ff06cee0339
+  data.tar.gz: 23b36babca7556403e80a85f64d87117bd0afc39
 SHA512:
-  metadata.gz: 0d5a0ad3df986f73d4729334bab6353b3b77372f1bb78d65f2a5ff5ae626cc5a3a616f5be7ebe32887ea059da6452dbd5e8c1c9a9cf37a71df88ac77f5b9a08d
-  data.tar.gz: 840fdd50d95167f638d5fbb78e5fedeb72d42910a45781b3a50af50feb968121b790d9c7a954de653ee3d408deda9782cd18ac49e80d5fef1659dce94082dfbe
+  metadata.gz: a411a366d8aad05c009a1dbdd8adb436d96f2f368be14e7f6169e54ff13121f4e15e689295602093ce30b19721a4de8355adbf0b7bca93c61b9e1bdbf4c1015f
+  data.tar.gz: c1fdf90de136162338a5f2ba580adc40d62d1b1f7acbf1466f09fd9931e6e702da84f4552865ca210a0c516869afcbb96de194a579670261fb7674a1d655bba7

data/lib/sqlstmt/sqlstmt.rb

@@ -222,40 +222,28 @@ private
 
   def verify_minimum_requirements
     if !@stmt_type
-      raise SqlStmtError, "unable to build sql - must specify statement type"
-    elsif (@where_behavior == :require) && @wheres.empty?
+      raise SqlStmtError, "unable to build sql - must call :select, :update, :insert or :delete to specify statement type"
+    elsif @tables.empty?
+      raise SqlStmtError, "unable to build sql - must call :table"
+    end
+
+    if (@where_behavior == :require) && @wheres.empty?
       raise SqlStmtError, "unable to build sql - must call :where, :no_where, or :optional_where"
     elsif (@where_behavior == :exclude) && !@wheres.empty?
       raise SqlStmtError, "unable to build sql - :where and :no_where must not both be called, consider :optional_where instead"
     end
 
-    if ['select','insert','delete'].include?(@stmt_type)
-      raise SqlStmtError, "unable to build sql - must call :table or :join (or one if it's variants)" if @tables.empty? && @joins.empty?
-      raise SqlStmtError, "unable to build sql - must call :table if using :join (or one if it's variants)" if @tables.empty? && !@joins.empty?
-    end
-
     if @stmt_type == 'select'
-      raise SqlStmtError, "unable to build sql - must call :field" if @fields.empty?
-    end
-
-    if @stmt_type == 'insert_values'
+      raise SqlStmtError, "unable to build sql - must call :get" if @fields.empty?
+    elsif @stmt_type == 'update'
+      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 call :into" if @into_table.nil?
-      raise SqlStmtError, "unable to build sql - must call :field or :fieldq" if @fields.empty?
-    end
-
-    if @stmt_type == 'insert_select'
-      raise SqlStmtError, "unable to build sql - must call :into" if @into_table.nil?
-      raise SqlStmtError, "unable to build sql - must call :field or :fieldq" if @fields.empty?
-    end
-
-    if @stmt_type == 'update'
-      raise SqlStmtError, "unable to build sql - must call :table" if @tables.empty?
-      raise SqlStmtError, "unable to build sql - must call :field or :fieldq" if @fields.empty?
-    end
-
-    if @stmt_type == 'delete'
-      combined_table_count = @tables.size + @joins.size
-      raise SqlStmtError, "unable to build sql - must call :from when including multiple tables" if @tables_to_delete.empty? && (combined_table_count > 1)
+      raise SqlStmtError, "unable to build sql - must call :set or :setq" if @fields.empty?
+    elsif @stmt_type == 'delete'
+      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
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlstmt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Makani Mason