baza 0.0.13 → 0.0.14

data/include/query_buffer.rb

@@ -1,7 +1,7 @@
 #This class buffers a lot of queries and flushes them out via transactions.
 class Baza::QueryBuffer
   attr_reader :thread_async
-  
+
   INITIALIZE_ARGS_ALLOWED = [:db, :debug, :flush_async]
   #Constructor. Takes arguments to be used and a block.
   def initialize(args)
@@ -11,14 +11,14 @@ class Baza::QueryBuffer
     @queries_count = 0
     @debug = @args[:debug]
     @lock = Mutex.new
-    
+
     STDOUT.puts "Query buffer started." if @debug
-    
+
     if block_given?
       if @args[:flush_async]
         @args[:db].clone_conn do |db_flush_async|
           @db_flush_async = db_flush_async
-          
+
           begin
             yield(self)
           ensure
@@ -28,15 +28,15 @@ class Baza::QueryBuffer
         end
       else
         begin
-			    yield(self)
+          yield(self)
         ensure
           flush
           thread_async_join
         end
       end
-		end
+    end
   end
-  
+
   #Adds a query to the buffer.
   def query(str)
     @lock.synchronize do
@@ -44,11 +44,11 @@ class Baza::QueryBuffer
       @queries << str
       @queries_count += 1
     end
-    
+
     flush if @queries_count >= 1000
     return nil
   end
-  
+
   #Delete as on a normal Baza::Db.
   #===Example
   # buffer.delete(:users, {:id => 5})
@@ -57,7 +57,7 @@ class Baza::QueryBuffer
     query(@args[:db].delete(table, where, :return_sql => true))
     return nil
   end
-  
+
   #Update as on a normal Baza::Db.
   #===Example
   # buffer.update(:users, {:name => "Kasper"}, {:id => 5})
@@ -66,7 +66,7 @@ class Baza::QueryBuffer
     query(@args[:db].update(table, update, terms, :return_sql => true))
     return nil
   end
-  
+
   #Shortcut to doing upsert through the buffer instead of through the db-object with the buffer as an argument.
   #===Example
   # buffer.upsert(:users, {:id => 5}, {:name => "Kasper"})
@@ -74,7 +74,7 @@ class Baza::QueryBuffer
     @args[:db].upsert(table, data, terms, :buffer => self)
     return nil
   end
-  
+
   #Plans to inset a hash into a table. It will only be inserted when flush is called.
   #===Examples
   # buffer.insert(:users, {:name => "John Doe"})
@@ -82,7 +82,7 @@ class Baza::QueryBuffer
     query(@args[:db].insert(table, data, :return_sql => true))
     return nil
   end
-  
+
   #Flushes all queries out in a transaction. This will automatically be called for every 1000 queries.
   def flush
     if @args[:flush_async]
@@ -91,13 +91,13 @@ class Baza::QueryBuffer
       flush_real
     end
   end
-  
+
   private
-  
+
   #Runs the flush in a thread in the background.
   def flush_async
     thread_async_join
-    
+
     @thread_async = Thread.new do
       begin
         flush_real(@db_flush_async)
@@ -107,18 +107,18 @@ class Baza::QueryBuffer
       end
     end
   end
-  
+
   def thread_async_join
     if thread = @thread_async
       thread.join
     end
   end
-  
+
   #Flushes the queries for real.
   def flush_real(db = nil)
     return nil if @queries_count <= 0
     db = @args[:db] if db == nil
-    
+
     @lock.synchronize do
       if !@queries.empty?
         while !@queries.empty?
@@ -130,18 +130,18 @@ class Baza::QueryBuffer
           end
         end
       end
-      
+
       @inserts.each do |table, datas_arr|
         while !datas_arr.empty?
           datas_chunk_arr = datas_arr.shift(1000)
           @db.insert_multi(table, datas_chunk_arr)
         end
       end
-      
+
       @inserts.clear
       @queries_count = 0
     end
-    
+
     return nil
   end
 end

data/include/revision.rb

@@ -20,14 +20,14 @@
 #     }
 #   }
 # }
-# 
+#
 # rev = Baza::Revision.new
 # rev.init_db("db" => db, "schema" => schema)
 class Baza::Revision
   def initialize(args = {})
     @args = args
   end
-  
+
   INIT_DB_ALLOWED_ARGS = [:db, :schema, :tables_cache, :debug]
   INIT_DB_SCHEMA_ALLOWED_ARGS = [:tables]
   INIT_DB_TABLE_ALLOWED_ARGS = [:columns, :indexes, :rows, :renames]
@@ -39,19 +39,19 @@ class Baza::Revision
     args.each do |key, val|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless INIT_DB_ALLOWED_ARGS.include?(key)
     end
-    
+
     schema = args[:schema]
     db = args[:db]
     raise "No 'db' was given." if !db
-    
+
     schema.each do |key, val|
       raise "Invalid key for schema: '#{key}' (#{key.class.name})." unless INIT_DB_SCHEMA_ALLOWED_ARGS.include?(key)
     end
-    
+
     #Check for normal bugs and raise apropiate error.
     raise "'schema' argument was not a Hash: '#{schema.class.name}'." if !schema.is_a?(Hash)
     raise "No tables given." if !schema.has_key?(:tables)
-    
+
     #Cache tables to avoid constant reloading.
     if !args.key?(:tables_cache) or args[:tables_cache]
       puts "Caching tables-list." if args[:debug]
@@ -59,23 +59,23 @@ class Baza::Revision
     else
       puts "Skipping tables-cache." if args[:debug]
     end
-    
+
     schema[:tables].each do |table_name, table_data|
       table_data.each do |key, val|
         raise "Invalid key: '#{key}' (#{key.class.name})." unless INIT_DB_TABLE_ALLOWED_ARGS.include?(key)
       end
-      
+
       begin
         begin
           table_name = table_name.to_sym
-          
+
           puts "Getting table-object for table: '#{table_name}'." if args[:debug]
           table_obj = db.tables[table_name]
-          
+
           #Cache indexes- and column-objects to avoid constant reloading.
           cols = table_obj.columns
           indexes = table_obj.indexes
-          
+
           if table_data[:columns]
             first_col = true
             table_data[:columns].each do |col_data|
@@ -85,7 +85,7 @@ class Baza::Revision
                 col_str = "#{table_name}.#{col_obj.name}"
                 type = col_data[:type].to_sym
                 dochange = false
-                
+
                 if !first_col and !col_data[:after]
                   #Try to find out the previous column - if so we can set "after" which makes the column being created in the right order as defined.
                   if !col_data.has_key?(:after)
@@ -96,7 +96,7 @@ class Baza::Revision
                       col_data[:after] = prev_col_data[:name]
                     end
                   end
-                  
+
                   actual_after = nil
                   set_next = false
                   cols.each do |col_name, col_iter|
@@ -106,53 +106,53 @@ class Baza::Revision
                       actual_after = col_iter.name
                     end
                   end
-                  
+
                   if actual_after != col_data[:after]
                     print "Changing '#{col_str}' after from '#{actual_after}' to '#{col_data[:after]}'.\n" if args[:debug]
                     dochange = true
                   end
                 end
-                
+
                 #BUGFIX: When using SQLite3 the primary-column or a autoincr-column may never change type from int... This will break it!
                 if db.opts[:type] == "sqlite3" and col_obj.type.to_s == "int" and (col_data[:primarykey] or col_data[:autoincr]) and db.int_types.index(col_data[:type].to_s)
                   type = :int
                 end
-                
+
                 if type and col_obj.type.to_s != type
                   print "Type mismatch on #{col_str}: #{col_data[:type]}, #{col_obj.type}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.has_key?(:primarykey) and col_obj.primarykey? != col_data[:primarykey]
                   print "Primary-key mismatch for #{col_str}: #{col_data[:primarykey]}, #{col_obj.primarykey?}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.has_key?(:autoincr) and col_obj.autoincr? != col_data[:autoincr]
                   print "Auto-increment mismatch for #{col_str}: #{col_data[:autoincr]}, #{col_obj.autoincr?}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.has_key?(:maxlength) and col_obj.maxlength.to_s != col_data[:maxlength].to_s
                   print "Maxlength mismatch on #{col_str}: #{col_data[:maxlength]}, #{col_obj.maxlength}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.has_key?(:null) and col_obj.null?.to_s != col_data[:null].to_s
                   print "Null mismatch on #{col_str}: #{col_data[:null]}, #{col_obj.null?}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.has_key?(:default) and col_obj.default.to_s != col_data[:default].to_s
                   print "Default mismatch on #{col_str}: #{col_data[:default]}, #{col_obj.default}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.has_key?(:comment) and col_obj.respond_to?(:comment) and col_obj.comment.to_s != col_data[:comment].to_s
                   print "Comment mismatch on #{col_str}: #{col_data[:comment]}, #{col_obj.comment}\n" if args[:debug]
                   dochange = true
                 end
-                
+
                 if col_data.is_a?(Hash) and col_data[:on_before_alter]
                   callback_data = col_data[:on_before_alter].call(:db => db, :table => table_obj, :col => col_obj, :col_data => col_data)
                   if callback_data and callback_data[:action]
@@ -161,24 +161,24 @@ class Baza::Revision
                     end
                   end
                 end
-                
+
                 if dochange
                   col_data_change = col_data.clone
                   col_data_change.delete(:renames)
-                  
+
                   col_obj.change(col_data_change)
-                  
+
                   #Change has been made - update cache.
                   cols = table_obj.columns
                 end
-                
+
                 first_col = false
               rescue Errno::ENOENT => e
                 print "Column not found: #{table_obj.name}.#{col_data[:name]}.\n" if args[:debug]
-                
+
                 if col_data.has_key?(:renames)
                   raise "'renames' was not an array for column '#{table_obj.name}.#{col_data[:name]}'." if !col_data[:renames].is_a?(Array)
-                  
+
                   rename_found = false
                   col_data[:renames].each do |col_name|
                     begin
@@ -186,47 +186,47 @@ class Baza::Revision
                     rescue Errno::ENOENT => e
                       next
                     end
-                    
+
                     print "Rename #{table_obj.name}.#{col_name} to #{table_obj.name}.#{col_data[:name]}\n" if args[:debug]
                     if col_data.is_a?(Hash) and col_data[:on_before_rename]
                       col_data[:on_before_rename].call(:db => db, :table => table_obj, :col => col_rename, :col_data => col_data)
                     end
-                    
+
                     col_data_change = col_data.clone
                     col_data_change.delete(:renames)
-                    
+
                     col_rename.change(col_data_change)
-                    
+
                     #Change has been made - update cache.
                     cols = table_obj.columns
-                    
+
                     if col_data.is_a?(Hash) and col_data[:on_after_rename]
                       col_data[:on_after_rename].call(:db => db, :table => table_obj, :col => col_rename, :col_data => col_data)
                     end
-                    
+
                     rename_found = true
                     break
                   end
-                  
+
                   retry if rename_found
                 end
-                
+
                 oncreated = col_data[:on_created]
                 col_data.delete(:on_created) if col_data[:oncreated]
-                
+
                 col_data_create = col_data
                 col_data_create.delete(:renames)
-                
+
                 col_obj = table_obj.create_columns([col_data])
-                
+
                 #Change has been made - update cache.
                 cols = table_obj.columns
-                
+
                 oncreated.call(:db => db, :table => table_obj) if oncreated
               end
             end
           end
-          
+
           if table_data[:columns_remove]
             table_data[:columns_remove].each do |column_name, column_data|
               begin
@@ -234,24 +234,24 @@ class Baza::Revision
               rescue Errno::ENOENT => e
                 next
               end
-              
+
               column_data[:callback].call if column_data.is_a?(Hash) and column_data[:callback]
               col_obj.drop
             end
           end
-          
+
           if table_data[:indexes]
             table_data[:indexes].each do |index_data|
               if index_data.is_a?(String) or index_data.is_a?(Symbol)
                 index_data = {:name => index_data, :columns => [index_data]}
               end
-              
+
               begin
                 index_obj = table_obj.index(index_data[:name])
-                
+
                 rewrite_index = false
                 rewrite_index = true if index_data.key?(:unique) and index_data[:unique] != index_obj.unique?
-                
+
                 if rewrite_index
                   index_obj.drop
                   table_obj.create_indexes([index_data])
@@ -261,7 +261,7 @@ class Baza::Revision
               end
             end
           end
-          
+
           if table_data[:indexes_remove]
             table_data[:indexes_remove].each do |index_name, index_data|
               begin
@@ -269,19 +269,19 @@ class Baza::Revision
               rescue Errno::ENOENT => e
                 next
               end
-              
+
               if index_data.is_a?(Hash) and index_data[:callback]
                 index_data[:callback].call if index_data[:callback]
               end
-              
+
               index_obj.drop
             end
           end
-          
+
           rows_init(:db => db, :table => table_obj, :rows => table_data[:rows]) if table_data and table_data[:rows]
         rescue Errno::ENOENT => e
           puts "Table did not exist: '#{table_name}'." if args[:debug]
-          
+
           if table_data.key?(:renames)
             table_data[:renames].each do |table_name_rename|
               begin
@@ -294,34 +294,34 @@ class Baza::Revision
               end
             end
           end
-          
+
           if !table_data.key?(:columns)
-            print "Notice: Skipping creation of '#{table_name}' because no columns were given in hash.\n"
+            puts "Notice: Skipping creation of '#{table_name}' because no columns were given in hash." if args[:debug]
             next
           end
-          
+
           if table_data[:on_create]
             table_data[:on_create].call(:db => db, :table_name => table_name, :table_data => table_data)
           end
-          
+
           table_data_create = table_data.clone
           table_data_create.delete(:rows)
-          
+
           puts "Creating table: '#{table_name}'." if args[:debug]
           db.tables.create(table_name, table_data_create)
           table_obj = db.tables[table_name.to_sym]
-          
+
           if table_data[:on_create_after]
             table_data[:on_create_after].call(:db => db, :table_name => table_name, :table_data => table_data)
           end
-          
+
           rows_init(:db => db, :table => table_obj, :rows => table_data[:rows]) if table_data[:rows]
         end
       rescue Knj::Errors::Retry
         retry
       end
     end
-    
+
     if schema[:tables_remove]
       schema[:tables_remove].each do |table_name, table_data|
         begin
@@ -333,28 +333,28 @@ class Baza::Revision
         end
       end
     end
-    
-    
+
+
     #Free cache.
     tables.clear if tables
     tables = nil
   end
-  
+
   private
-  
+
   ROWS_INIT_ALLOWED_ARGS = [:db, :table, :rows]
   #This method checks if certain rows are present in a table based on a hash.
   def rows_init(args)
     args.each do |key, val|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless ROWS_INIT_ALLOWED_ARGS.include?(key)
     end
-    
+
     db = args[:db]
     table = args[:table]
-    
+
     raise "No db given." if !db
     raise "No table given." if !table
-    
+
     args[:rows].each do |row_data|
       if row_data[:find_by]
         find_by = row_data[:find_by]
@@ -363,17 +363,17 @@ class Baza::Revision
       else
         raise "Could not figure out the find-by."
       end
-      
+
       rows_found = 0
       args[:db].select(table.name, find_by) do |d_rows|
         rows_found += 1
-        
+
         if Knj::ArrayExt.hash_diff?(Knj::ArrayExt.hash_sym(row_data[:data]), Knj::ArrayExt.hash_sym(d_rows), {"h2_to_h1" => false})
           print "Data was not right - updating row: #{JSON.generate(row_data[:data])}\n" if args[:debug]
           args[:db].update(table.name, row_data[:data], d_rows)
         end
       end
-      
+
       if rows_found == 0
         print "Inserting row: #{JSON.generate(row_data[:data])}\n" if args[:debug]
         table.insert(row_data[:data])

data/lib/baza.rb

@@ -1,3 +1,5 @@
+require "string-cases"
+
 class Baza
   #Autoloader for subclasses.
   def self.const_missing(name)
@@ -6,4 +8,4 @@ class Baza
     raise "Still not defined: '#{name}'." if !Baza.const_defined?(name)
     return Baza.const_get(name)
   end
-end
+end

data/shippable.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.1.2
+before_script:
+  - cp spec/info_mysql_shippable.rb spec/info_mysql.rb
+  - cp spec/info_active_record_shippable.rb spec/info_active_record.rb
+  - mysql -e 'CREATE DATABASE baza;'
+script:
+  - CODECLIMATE_REPO_TOKEN=98c06de7271764c9cd7bbde7cee4ddfa0d3e7db4bd9933f17779100276672e5f bundle exec rspec
+notifications:
+   email: false

data/spec/include/drivers/active_record_spec.rb

@@ -0,0 +1,8 @@
+require "spec_helper"
+
+describe Baza::Driver::ActiveRecord do
+  it_behaves_like "a baza driver"
+  it_should_behave_like "a baza tables driver"
+  it_should_behave_like "a baza columns driver"
+  it_should_behave_like "a baza indexes driver"
+end

data/spec/include/drivers/mysql_spec.rb

@@ -0,0 +1,47 @@
+require "spec_helper"
+
+describe Baza::Driver::Mysql do
+  it_should_behave_like "a baza driver"
+  it_should_behave_like "a baza tables driver"
+  it_should_behave_like "a baza columns driver"
+  it_should_behave_like "a baza indexes driver"
+
+  it "should dump to sqlite3" do
+    require "info_sqlite3"
+    require "info_mysql"
+
+    driver1 = Baza::InfoMysql.new
+    db1 = driver1.db
+    driver1.before
+
+    driver2 = Baza::InfoSqlite3.new
+    db2 = driver2.db
+    driver2.before
+
+    begin
+      db1.tables.create(:test_table, columns: [
+        {name: :id, type: :int, autoincr: true, primarykey: true},
+        {name: :name, type: :varchar, maxlength: 100}
+      ])
+      test_table = db1.tables[:test_table]
+
+
+      db1.copy_to(db2)
+
+      table_sqlite = db2.tables[:test_table]
+      table_sqlite.columns.length.should eq test_table.columns.length
+
+      col_id_sqlite = table_sqlite.column(:id)
+      col_id_sqlite.type.should eq :int
+      col_id_sqlite.autoincr?.should eq true
+      col_id_sqlite.primarykey?.should eq true
+
+      col_name_sqlite = table_sqlite.column(:name)
+      col_name_sqlite.type.should eq :varchar
+      col_name_sqlite.maxlength.to_i.should eq 100
+    ensure
+      driver1.after
+      driver2.after
+    end
+  end
+end