baza 0.0.14 → 0.0.15

data/include/model_handler_sqlhelper.rb

@@ -2,39 +2,39 @@ class Baza::ModelHandler
   #This method helps build SQL from Objects-instances list-method. It should not be called directly but only through Objects.list.
   def sqlhelper(list_args, args_def)
     args = args_def
-    
+
     if args[:db]
       db = args[:db]
     else
       db = @args[:db]
     end
-    
+
     if args[:table]
       table_def = "`#{db.esc_table(args[:table])}`."
     else
       table_def = ""
     end
-    
+
     sql_joins = ""
     sql_where = ""
     sql_order = ""
     sql_limit = ""
     sql_groupby = ""
-    
+
     do_joins = {}
-    
+
     limit_from = nil
     limit_to = nil
-    
+
     if list_args.key?("orderby")
       orders = []
       orderstr = list_args["orderby"]
       list_args["orderby"] = [list_args["orderby"]] if list_args["orderby"].is_a?(Hash)
-      
+
       if list_args["orderby"].is_a?(String)
         found = false
         found = true if args[:cols].key?(orderstr)
-        
+
         if found
           sql_order << " ORDER BY "
           ordermode = " ASC"
@@ -45,28 +45,28 @@ class Baza::ModelHandler
               ordermode = " ASC"
               raise "Unknown ordermode: #{list_args["ordermode"]}"
             end
-            
+
             list_args.delete("ordermode")
           end
-          
+
           sql_order << "#{table_def}`#{db.esc_col(list_args["orderby"])}`#{ordermode}"
           list_args.delete("orderby")
         end
       elsif list_args["orderby"].is_a?(Array)
         sql_order << " ORDER BY "
-        
+
         list_args["orderby"].each do |val|
           ordermode = nil
           orderstr = nil
           found = false
-          
+
           if val.is_a?(Array)
             if val[1] == "asc"
               ordermode = " ASC"
             elsif val[1] == "desc"
               ordermode = " DESC"
             end
-            
+
             if val[0].is_a?(Array)
               if args[:joined_tables]
                 args[:joined_tables].each do |table_name, table_data|
@@ -77,7 +77,7 @@ class Baza::ModelHandler
                   break
                 end
               end
-              
+
               raise "Could not find joined table for ordering: '#{val[0][0]}'." if !found
             else
               orderstr = val[0]
@@ -90,15 +90,15 @@ class Baza::ModelHandler
             found = true
           elsif val.is_a?(Hash) and val[:type] == :case
             caseorder = " CASE"
-            
+
             val[:case].each do |key, caseval|
               col = key.first
               isval = key.last
               col_str = nil
-              
+
               if col.is_a?(Array)
                 raise "No joined tables for '#{args[:table]}'." if !args[:joined_tables]
-                
+
                 found = false
                 args[:joined_tables].each do |table_name, table_data|
                   if table_name == col.first
@@ -108,7 +108,7 @@ class Baza::ModelHandler
                     break
                   end
                 end
-                
+
                 raise "No such joined table on '#{args[:table]}': '#{col.first}' (#{col.first.class.name}) with the following joined table:\n#{Php4r.print_r(args[:joined_tables], true)}" if !found
               elsif col.is_a?(String) or col.is_a?(Symbol)
                 col_str = "#{table_def}`#{col}`"
@@ -116,26 +116,26 @@ class Baza::ModelHandler
               else
                 raise "Unknown type for case-ordering: '#{col.class.name}'."
               end
-              
+
               raise "'colstr' was not set." if !col_str
               caseorder << " WHEN #{col_str} = '#{db.esc(isval)}' THEN '#{db.esc(caseval)}'"
             end
-            
+
             if val[:else]
               caseorder << " ELSE '#{db.esc(val[:else])}'"
             end
-            
+
             caseorder << " END"
             orders << caseorder
           elsif val.is_a?(Hash)
             raise "No joined tables." if !args.key?(:joined_tables)
-            
+
             if val[:mode] == "asc"
               ordermode = " ASC"
             elsif val[:mode] == "desc"
               ordermode = " DESC"
             end
-            
+
             if args[:joined_tables]
               args[:joined_tables].each do |table_name, table_data|
                 if table_data[:parent_table]
@@ -145,10 +145,10 @@ class Baza::ModelHandler
                 else
                   table_name_real = @args[:module].const_get(table_name).classname
                 end
-                
+
                 if table_name.to_s == val[:table].to_s
                   do_joins[table_name] = true
-                  
+
                   if val[:sql]
                     orders << val[:sql]
                   elsif val[:col]
@@ -156,7 +156,7 @@ class Baza::ModelHandler
                   else
                     raise "Couldnt figure out how to order based on keys: '#{val.keys.sort}'."
                   end
-                  
+
                   found = true
                   break
                 end
@@ -165,26 +165,26 @@ class Baza::ModelHandler
           else
             raise "Unknown object: #{val.class.name}"
           end
-          
+
           found = true if args[:cols].key?(orderstr)
-          
+
           if !found
             raise "Column not found for ordering: #{orderstr}."
           end
-          
+
           orders << "#{table_def}`#{db.esc_col(orderstr)}`#{ordermode}" if orderstr
         end
-        
+
         sql_order << orders.join(", ")
         list_args.delete("orderby")
       else
         raise "Unknown orderby object: #{list_args["orderby"].class.name}."
       end
     end
-    
+
     list_args.each do |realkey, val|
       found = false
-      
+
       if realkey.is_a?(Array)
         if !args[:joins_skip]
           datarow_obj = self.datarow_obj_from_args(args_def, list_args, realkey[0])
@@ -194,7 +194,7 @@ class Baza::ModelHandler
           datarow_obj = @args[:module].const_get(realkey[0])
           args = args_def
         end
-        
+
         table_sym = realkey[0].to_sym
         do_joins[table_sym] = true
         list_table_name_real = table_sym
@@ -205,10 +205,10 @@ class Baza::ModelHandler
         args = args_def
         key = realkey
       end
-      
+
       if args.key?(:cols_bools) and args[:cols_bools].index(key) != nil
         val_s = val.to_s
-        
+
         if val_s == "1" or val_s == "true"
           realval = "1"
         elsif val_s == "0" or val_s == "false"
@@ -216,7 +216,7 @@ class Baza::ModelHandler
         else
           raise "Could not make real value out of class: #{val.class.name} => #{val}."
         end
-        
+
         sql_where << " AND #{table}`#{db.esc_col(key)}` = '#{db.esc(realval)}'"
         found = true
       elsif args[:cols].key?(key.to_s)
@@ -246,7 +246,7 @@ class Baza::ModelHandler
         else
           sql_where << " AND #{table}`#{db.esc_col(key)}` = '#{db.esc(val)}'"
         end
-        
+
         found = true
       elsif key.to_s == "limit_from"
         limit_from = val.to_i
@@ -270,7 +270,7 @@ class Baza::ModelHandler
         else
           sql_where << " AND #{table}`#{db.esc_col(key.to_s + "_id")}` = '#{db.esc(val.id)}'"
         end
-        
+
         found = true
       elsif match = key.match(/^([A-z_\d]+)_(search|has)$/) and args[:cols].key?(match[1]) != nil
         if match[2] == "search"
@@ -284,7 +284,7 @@ class Baza::ModelHandler
             sql_where << " AND #{table}`#{db.esc_col(match[1])}` = ''"
           end
         end
-        
+
         found = true
       elsif match = key.match(/^([A-z_\d]+)_(not|lower)$/) and args[:cols].key?(match[1])
         if match[2] == "not"
@@ -310,27 +310,27 @@ class Baza::ModelHandler
         else
           raise "Unknown mode: '#{match[2]}'."
         end
-        
+
         found = true
       elsif args.key?(:cols_date) and match = key.match(/^(.+)_(day|week|month|year|from|to|below|above)(|_(not))$/) and args[:cols_date].index(match[1]) != nil
         not_v = match[4]
         val = Datet.in(val) if val.is_a?(Time)
-        
+
         if match[2] == "day"
           if val.is_a?(Array)
             sql_where << " AND ("
             first = true
-            
+
             val.each do |realval|
               if first
                 first = false
               else
                 sql_where << " OR "
               end
-              
+
               sql_where << "#{db.sqlspecs.strftime("%d %m %Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{db.sqlspecs.strftime("%d %m %Y", "'#{db.esc(realval.dbstr)}'")}"
             end
-            
+
             sql_where << ")"
           else
             sql_where << " AND #{db.sqlspecs.strftime("%d %m %Y", "#{table}`#{db.esc_col(match[1])}`")} #{self.not(not_v, "!")}= #{db.sqlspecs.strftime("%d %m %Y", "'#{db.esc(val.dbstr)}'")}"
@@ -348,7 +348,7 @@ class Baza::ModelHandler
         else
           raise "Unknown date-key: #{match[2]}."
         end
-        
+
         found = true
       elsif args.key?(:cols_num) and match = key.match(/^(.+)_(from|to|above|below|numeric)$/) and args[:cols_num].index(match[1]) != nil
         if match[2] == "from"
@@ -362,7 +362,7 @@ class Baza::ModelHandler
         else
           raise "Unknown method of treating cols-num-argument: #{match[2]}."
         end
-        
+
         found = true
       elsif match = key.match(/^(.+)_lookup$/) and args[:cols].key?("#{match[1]}_id") and args[:cols].key?("#{match[1]}_class")
         sql_where << " AND #{table}`#{db.esc_col("#{match[1]}_class")}` = '#{db.esc(val.table)}'"
@@ -370,7 +370,7 @@ class Baza::ModelHandler
         found = true
       elsif realkey == "groupby"
         found = true
-        
+
         if val.is_a?(Array)
           val.each do |col_name|
             raise "Column '#{val}' not found on table '#{table}'." if !args[:cols].key?(col_name)
@@ -384,19 +384,19 @@ class Baza::ModelHandler
           raise "Unknown class given for 'groupby': '#{val.class.name}'."
         end
       end
-      
+
       list_args.delete(realkey) if found
     end
-    
+
     args = args_def
-    
+
     if !args[:joins_skip]
       raise "No joins defined on '#{args[:table]}' for: '#{args[:table]}'." if !do_joins.empty? and !args[:joined_tables]
-      
+
       do_joins.each do |table_name, temp_val|
         raise "No join defined on table '#{args[:table]}' for table '#{table_name}'." if !args[:joined_tables].key?(table_name)
         table_data = args[:joined_tables][table_name]
-        
+
         if table_data.key?(:parent_table)
           join_table_name_real = table_name
           sql_joins << " LEFT JOIN `#{table_data[:parent_table]}` AS `#{table_name}` ON 1=1"
@@ -405,50 +405,50 @@ class Baza::ModelHandler
           join_table_name_real = const.classname
           sql_joins << " LEFT JOIN `#{const.table}` AS `#{const.classname}` ON 1=1"
         end
-        
+
         if table_data[:ob]
           ob = table_data[:ob]
         else
           ob = self
         end
-        
+
         class_name = args[:table].to_sym
-        
+
         if table_data[:datarow]
           datarow = self.datarow_from_datarow_argument(table_data[:datarow])
         else
           self.requireclass(class_name) if @objects.key?(class_name)
           datarow = @args[:module].const_get(class_name)
         end
-        
+
         if !datarow.columns_sqlhelper_args
           ob.requireclass(datarow.table.to_sym)
           raise "No SQL-helper-args on class '#{datarow.table}' ???" if !datarow.columns_sqlhelper_args
         end
-        
+
         newargs = datarow.columns_sqlhelper_args.clone
         newargs[:table] = join_table_name_real
         newargs[:joins_skip] = true
-        
+
         #Clone the where-arguments and run them against another sqlhelper to sub-join.
         join_args = table_data[:where].clone
         ret = self.sqlhelper(join_args, newargs)
         sql_joins << ret[:sql_where]
-        
+
         #If any of the join-arguments are left, then we should throw an error.
         join_args.each do |key, val|
           raise "Invalid key '#{key}' when trying to join table '#{table_name}' on table '#{args_def[:table]}'."
         end
       end
     end
-    
+
     #If limit arguments has been given then add them.
     if limit_from and limit_to
       sql_limit = " LIMIT #{limit_from}, #{limit_to}"
     end
-    
-    sql_groupby = nil if sql_groupby.length <= 0
-    
+
+    sql_groupby = nil if sql_groupby.empty?
+
     return {
       :sql_joins => sql_joins,
       :sql_where => sql_where,
@@ -457,43 +457,43 @@ class Baza::ModelHandler
       :sql_groupby => sql_groupby
     }
   end
-  
+
   #Used by sqlhelper-method to look up datarow-classes and automatically load them if they arent loaded already.
   def datarow_obj_from_args(args, list_args, class_name)
     class_name = class_name.to_sym
-    
+
     if !args.key?(:joined_tables)
       raise "No joined tables on '#{args[:table]}' to find datarow for: '#{class_name}'."
     end
-    
+
     args[:joined_tables].each do |table_name, table_data|
       next if table_name.to_sym != class_name
       return self.datarow_from_datarow_argument(table_data[:datarow]) if table_data[:datarow]
-      
+
       self.requireclass(class_name) if @objects.key?(class_name)
       return @args[:module].const_get(class_name)
     end
-    
+
     raise "Could not figure out datarow for: '#{class_name}'."
   end
-  
+
   def datarow_from_datarow_argument(datarow_argument)
     if datarow_argument.is_a?(String)
       const = Knj::Strings.const_get_full(datarow_argument)
     else
       const = datarow_argument
     end
-    
+
     self.load_class(datarow_argument.to_s.split("::").last) if !const.initialized? #Make sure the class is initialized.
-    
+
     return const
   end
-  
+
   def not(not_v, val)
     if not_v == "not" or not_v == "not_"
       return val
     end
-    
+
     return ""
   end
-end
+end

data/spec/support/driver_columns_collection.rb

@@ -46,4 +46,21 @@ shared_examples_for "a baza columns driver" do
     col_text = test_table.column(:text)
     col_text.type.should eq :varchar
   end
+
+  it "should be able to change columns" do
+    col_text = test_table.column(:text)
+    col_text.change(name: "text2", type: :int, default: 5)
+
+    col_text.type.should eq :int
+    col_text.default.should eq "5"
+    col_text.name.should eq :text2
+  end
+
+  it "should be able to drop a column" do
+    test_table.column(:text).drop
+
+    expect {
+      test_table.column(:text)
+    }.to raise_error(Errno::ENOENT)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datet
@@ -200,16 +200,28 @@ files:
 - include/driver.rb
 - include/drivers/active_record/active_record.rb
 - include/drivers/mysql/mysql.rb
+- include/drivers/mysql/mysql_column.rb
 - include/drivers/mysql/mysql_columns.rb
+- include/drivers/mysql/mysql_index.rb
 - include/drivers/mysql/mysql_indexes.rb
+- include/drivers/mysql/mysql_result.rb
+- include/drivers/mysql/mysql_result_java.rb
+- include/drivers/mysql/mysql_result_mysql2.rb
+- include/drivers/mysql/mysql_result_unbuffered.rb
 - include/drivers/mysql/mysql_sqlspecs.rb
+- include/drivers/mysql/mysql_table.rb
 - include/drivers/mysql/mysql_tables.rb
 - include/drivers/sqlite3/libknjdb_java_sqlite3.rb
 - include/drivers/sqlite3/libknjdb_sqlite3_ironruby.rb
 - include/drivers/sqlite3/sqlite3.rb
+- include/drivers/sqlite3/sqlite3_column.rb
 - include/drivers/sqlite3/sqlite3_columns.rb
+- include/drivers/sqlite3/sqlite3_index.rb
 - include/drivers/sqlite3/sqlite3_indexes.rb
+- include/drivers/sqlite3/sqlite3_result.rb
+- include/drivers/sqlite3/sqlite3_result_java.rb
 - include/drivers/sqlite3/sqlite3_sqlspecs.rb
+- include/drivers/sqlite3/sqlite3_table.rb
 - include/drivers/sqlite3/sqlite3_tables.rb
 - include/dump.rb
 - include/idquery.rb