mv-mysql 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8aa8b6e5512b84d4f288704757de8502d7ef854
-  data.tar.gz: c008651d92cdd63134677faa774e0c687c1c554e
+  metadata.gz: 90e320daa83937ba93169384643381c662857b23
+  data.tar.gz: e9e1cb2fb399ad3bb270d1a2e1274150d33c9f84
 SHA512:
-  metadata.gz: ec43831d6a0040556ef11abc1dd8c1d177ff8464c100fb4d468c122dc66b715351928de75a4aa3efc9d91eade2b5942b4a11906f9115c668a59c77c41facab15
-  data.tar.gz: 5f293bccb5d619b951c91d82fd1427af36df30ec0d0468b962bdbecc61393cd66b1e28574432c5c351b30f14b621bf2dc8ce88811f5818b7ffb2e3ae91486ba3
+  metadata.gz: f9ea8c2b37d10ce07c45505def703c444e68ddd56afe4575489bb29f57418e0b4a9b3ecc4e3d3f9d939ec868d1c7e2a8c844c3c6dfe8ef0a4b6493e4bb362912
+  data.tar.gz: 0d64dfb7d3546b68f853f14be7ee55106751a355dd9ae0ea7a8915f1cb2f01b90653cedc804184343fc21dd9f40c595e76fe0b16b49c5892de5b4a6646e78d7c

data/README.md

@@ -757,6 +757,11 @@ Define validations directly in DB as MySQL constraints and integrate them into y
 
 * Fix issue with invalid parameters number in `add_column` and `change_column` methods
 
+**(2.2.4)** (23 Nov, 2015)
+
+* Do not camel case column name in error message
+* Use SIGNAL to raise validation exception for MySQL >= 5.5
+
 ## Contributing
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/lib/mv/mysql/active_record/connection_adapters/mysql_adapter_decorator.rb

@@ -4,8 +4,12 @@ module Mv
       module ConnectionAdapters
         module MysqlAdapterDecorator
           include Mv::Core::ActiveRecord::ConnectionAdapters::AbstractAdapterDecorator
+
+          def support_signal?
+            respond_to?(:full_version, true) && full_version >= '5.5'
+          end
         end
       end
     end
   end
-end
+end

data/lib/mv/mysql/constraint/builder/trigger.rb

@@ -25,7 +25,7 @@ module Mv
 
 
           def drop_trigger_statement table_name
-            "DROP TRIGGER IF EXISTS #{name};" 
+            "DROP TRIGGER IF EXISTS #{name};"
           end
 
           def create_trigger_statement table_name
@@ -40,12 +40,18 @@ module Mv
           def trigger_body(table_name)
             validation_builders.select{|b| b.table_name == table_name }.collect(&:conditions).flatten.collect do |condition|
               "IF NOT(#{condition[:statement]}) THEN
-                SET var = (SELECT MAX(1) FROM `#{condition[:message]}`); 
+                #{raise_error_statement(condition[:message])}
               END IF".squish
             end.join("; \n")
           end
+
+          def raise_error_statement message
+            return "SIGNAL SQLSTATE '45000' SET message_text = '#{message}';" if db.support_signal?
+
+            "SET var = (SELECT MAX(1) FROM `#{message}`);"
+          end
         end
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mv-mysql
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Valeriy Prokopchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement