lib/baza/drivers/mysql/columns.rb in baza-0.0.19 vs lib/baza/drivers/mysql/columns.rb in baza-0.0.20

@@ -1,17 +1,17 @@
-#This class handels various MySQL-column-specific operations.
+# This class handels various MySQL-column-specific operations.
 class Baza::Driver::Mysql::Columns
-  #Constructor. Should not be called manually.
+  # Constructor. Should not be called manually.
   def initialize(args)
     @args = args
   end
 
-  #Returns the SQL for this column.
+  # Returns the SQL for this column.
   DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames]
   def data_sql(data)
-    data.each do |key, val|
-      raise "Invalid key: '#{key}' (#{key.class.name})." if !DATA_SQL_ALLOWED_KEYS.include?(key)
+    data.each_key do |key|
+      raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
     end
 
     raise "No type given." unless data[:type]
     type = data[:type].to_sym
 
@@ -19,21 +19,21 @@
 
     sql = "`#{data[:name]}` #{type}"
     sql << "(#{data[:maxlength]})" if data[:maxlength]
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTO_INCREMENT" if data[:autoincr]
-    sql << " NOT NULL" if !data[:null]
+    sql << " NOT NULL" unless data[:null]
 
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
     elsif data.key?(:default) && data[:default] != false
       sql << " DEFAULT '#{@args[:db].escape(data[:default])}'"
     end
 
     sql << " COMMENT '#{@args[:db].escape(data[:comment])}'" if data.key?(:comment)
-    sql << " AFTER `#{@args[:db].esc_col(data[:after])}`" if data[:after] && !data[:first]
+    sql << " AFTER `#{@args[:db].escape_column(data[:after])}`" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
 
-    return sql
+    sql
   end
 end