baza 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a140880f4a29b160732e615d71edcbef2067558f
-  data.tar.gz: 18778633d92ec1fd6a90ebe77b070b07b4955698
+  metadata.gz: 0ca360eb0771fa4e40e286f2693d2e2957b9ee44
+  data.tar.gz: f9e91f37f01b60f6333fa1561d907c3ab7759d24
 SHA512:
-  metadata.gz: 684f412f2eb01b8f400b8fe3ba2b082a67fc606612d569140615fc38dbe05e0e899f2555e8fea9e1aeee804404b222be71049114153aadbe7d0e804ee6cf60b8
-  data.tar.gz: f5738e3752f928fd38b705149fc03c465283dfc302e8b4d7a4b734d811f0b02d6566d22ffcd95b8d7c025e267167d79a4c8d9e2eff87a89b6fff22076eb7d7d0
+  metadata.gz: ffbb2c02f6d404ceb64d4ebf7dca19f5a31d43e5fcfd0f43aac60fa42d61d459fb285c2308ec477f2ad8383cd7c2e8a2eac6746716e338841db2677608b1e448
+  data.tar.gz: ad1a9f018bed9a0e3ed570a2058d28ee6c83fa43ba821fe3f3b55de458cbde5f40685c5a21a4cbc0f4265f92f0ba9e376a348e0ab03ca3a824b0613a8510747b

data/VERSION

@@ -1 +1 @@
-0.0.23
+0.0.24

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.23 ruby lib
+# stub: baza 0.0.24 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.23"
+  s.version = "0.0.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Kasper Johansen".freeze]
-  s.date = "2017-01-22"
+  s.date = "2017-01-27"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -37,6 +37,8 @@ Gem::Specification.new do |s|
     "lib/baza/base_sql_driver.rb",
     "lib/baza/cloner.rb",
     "lib/baza/column.rb",
+    "lib/baza/commands.rb",
+    "lib/baza/commands/select.rb",
     "lib/baza/database.rb",
     "lib/baza/database_model.rb",
     "lib/baza/database_model_functionality.rb",

data/lib/baza/base_sql_driver.rb

@@ -105,86 +105,14 @@ class Baza::BaseSqlDriver
 
   SELECT_ARGS_ALLOWED_KEYS = [:limit, :limit_from, :limit_to].freeze
   # Makes a select from the given arguments: table-name, where-terms and other arguments as limits and orders. Also takes a block to avoid raping of memory.
-  def select(tablename, arr_terms = nil, args = nil, &block)
-    # Set up vars.
-    sql = ""
-    args_q = nil
-    select_sql = "*"
-
-    # Give 'cloned_ubuf' argument to 'q'-method.
-    args_q = {cloned_ubuf: true} if args && args[:cloned_ubuf]
-
-    # Set up IDQuery-stuff if that is given in arguments.
-    if args && args[:idquery]
-      if args.fetch(:idquery) == true
-        select_sql = "#{sep_col}id#{sep_col}"
-        col = :id
-      else
-        select_sql = "#{sep_col}#{escape_column(args.fetch(:idquery))}#{sep_col}"
-        col = args.fetch(:idquery)
-      end
-    end
-
-    sql = "SELECT #{select_sql} FROM"
-
-    if tablename.is_a?(Array)
-      sql << " #{@sep_table}#{tablename.first}#{@sep_table}.#{@sep_table}#{tablename.last}#{@sep_table}"
-    else
-      sql << " #{@sep_table}#{tablename}#{@sep_table}"
-    end
-
-    if !arr_terms.nil? && !arr_terms.empty?
-      sql << " WHERE #{sql_make_where(arr_terms)}"
-    end
-
-    unless args.nil?
-      if args[:orderby]
-        sql << " ORDER BY"
-
-        if args.fetch(:orderby).is_a?(Array)
-          first = true
-          args.fetch(:orderby).each do |order_by|
-            sql << "," unless first
-            first = false if first
-            sql << " #{sep_col}#{escape_column(order_by)}#{sep_col}"
-          end
-        else
-          sql << " #{sep_col}#{escape_column(args.fetch(:orderby))}#{sep_col}"
-        end
-      end
-
-      sql << " LIMIT #{args[:limit]}" if args[:limit]
-
-      if args[:limit_from] && args[:limit_to]
-        begin
-          Float(args[:limit_from])
-        rescue
-          raise "'limit_from' was not numeric: '#{args.fetch(:limit_from)}'."
-        end
-
-        begin
-          Float(args[:limit_to])
-        rescue
-          raise "'limit_to' was not numeric: '#{args[:limit_to]}'."
-        end
-
-        sql << " LIMIT #{args.fetch(:limit_from)}, #{args.fetch(:limit_to)}"
-      end
-    end
-
-    # Do IDQuery if given in arguments.
-    if args && args[:idquery]
-      res = Baza::Idquery.new(db: @db, table: tablename, query: sql, col: col, &block)
-    else
-      res = @db.q(sql, args_q, &block)
-    end
-
-    # Return result if a block wasnt given.
-    if block
-      return nil
-    else
-      return res
-    end
+  def select(table_name, terms = nil, args = nil, &block)
+    Baza::Commands::Select.new(
+      args: args,
+      block: block,
+      db: @db,
+      table_name: table_name,
+      terms: terms
+    ).execute
   end
 
   def count(tablename, arr_terms = nil)

data/lib/baza/commands.rb

@@ -0,0 +1,3 @@
+class Baza::Commands
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
+end

data/lib/baza/commands/select.rb

@@ -0,0 +1,110 @@
+class Baza::Commands::Select
+  def initialize(args)
+    @args = args.fetch(:args)
+    @block = args.fetch(:block)
+    @db = args.fetch(:db)
+    @sql = ""
+    @table_name = args.fetch(:table_name)
+    @terms = args.fetch(:terms)
+  end
+
+  def execute
+    # Give 'cloned_ubuf' argument to 'q'-method.
+    if @args
+      @args_q = {cloned_ubuf: true} if @args[:cloned_ubuf]
+      @args_q = {unbuffered: true} if @args[:unbuffered]
+    end
+
+    add_select_sql
+    add_terms_sql
+    add_order_sql
+    add_limit_sql
+
+    result = execute_query
+
+    # Return result if a block wasnt given.
+    if @block
+      nil
+    else
+      result
+    end
+  end
+
+private
+
+  def add_select_sql
+    # Set up IDQuery-stuff if that is given in arguments.
+    if @args && @args[:idquery]
+      if @args.fetch(:idquery) == true
+        select_sql = "#{@db.sep_col}id#{@db.sep_col}"
+        @col = :id
+      else
+        select_sql = "#{@db.sep_col}#{@db.escape_column(@args.fetch(:idquery))}#{@db.sep_col}"
+        @col = @args.fetch(:idquery)
+      end
+    end
+
+    select_sql ||= "*"
+    @sql << "SELECT #{select_sql} FROM"
+
+    if @table_name.is_a?(Array)
+      @sql << " #{@sep_table}#{@table_name.first}#{@sep_table}.#{@sep_table}#{@table_name.last}#{@sep_table}"
+    else
+      @sql << " #{@sep_table}#{@table_name}#{@sep_table}"
+    end
+  end
+
+  def add_terms_sql
+    @sql << " WHERE #{@db.sql_make_where(@terms)}" if !@terms.nil? && !@terms.empty?
+  end
+
+  def add_order_sql
+    return if @args.nil?
+
+    if @args[:orderby]
+      @sql << " ORDER BY"
+
+      if @args.fetch(:orderby).is_a?(Array)
+        first = true
+        @args.fetch(:orderby).each do |order_by|
+          @sql << "," unless first
+          first = false if first
+          @sql << " #{@db.sep_col}#{@db.escape_column(order_by)}#{@db.sep_col}"
+        end
+      else
+        @sql << " #{@db.sep_col}#{@db.escape_column(@args.fetch(:orderby))}#{@db.sep_col}"
+      end
+    end
+  end
+
+  def add_limit_sql
+    return if @args.nil?
+
+    @sql << " LIMIT #{@args[:limit]}" if @args[:limit]
+
+    if @args[:limit_from] && @args[:limit_to]
+      begin
+        Float(@args[:limit_from])
+      rescue
+        raise "'limit_from' was not numeric: '#{@args.fetch(:limit_from)}'."
+      end
+
+      begin
+        Float(@args[:limit_to])
+      rescue
+        raise "'limit_to' was not numeric: '#{@args[:limit_to]}'."
+      end
+
+      @sql << " LIMIT #{@args.fetch(:limit_from)}, #{@args.fetch(:limit_to)}"
+    end
+  end
+
+  def execute_query
+    # Do IDQuery if given in arguments.
+    if @args && @args[:idquery]
+      Baza::Idquery.new(db: @db, table: @table_name, query: @sql, col: @col, &@block)
+    else
+      @db.q(@sql, @args_q, &@block)
+    end
+  end
+end

data/lib/baza/driver/sqlite3/database.rb

@@ -1,2 +1,5 @@
 class Baza::Driver::Sqlite3::Database < Baza::Database
+  def use
+    # Dont do anything since the file only contains one database
+  end
 end

data/lib/baza/dump.rb

@@ -4,8 +4,9 @@ class Baza::Dump
   #===Examples
   # dump = Baza::Dump.new(:db => db)
   def initialize(args)
-    @args = args
-    @debug = @args[:debug]
+    @db = args.fetch(:db)
+    @debug = args[:debug]
+    @tables = args[:tables]
   end
 
   # Method used to update the status.
@@ -20,13 +21,13 @@ class Baza::Dump
 
   # Dumps all tables into the given IO.
   def dump(io)
-    print "Going through tables.\n" if @debug
+    debug "Going through tables."
     @rows_count = 0
 
-    if @args[:tables]
-      tables = @args[:tables]
+    if @tables
+      tables = @tables
     else
-      tables = @args[:db].tables.list
+      tables = @db.tables.list
     end
 
     if @on_status
@@ -39,7 +40,7 @@ class Baza::Dump
     end
 
     tables.each do |table_obj|
-      table_obj = @args[:db].tables[table_obj] if table_obj.is_a?(String) || table_obj.is_a?(Symbol)
+      table_obj = @db.tables[table_obj] if table_obj.is_a?(String) || table_obj.is_a?(Symbol)
       next if table_obj.native?
 
       # Figure out keys.
@@ -50,7 +51,7 @@ class Baza::Dump
 
       @table_obj = table_obj
       update_status
-      puts "Dumping table: '#{table_obj.name}'." if @debug
+      debug "Dumping table: '#{table_obj.name}'."
       dump_table(io, table_obj)
     end
   end
@@ -60,13 +61,17 @@ class Baza::Dump
     @on_status = block
   end
 
+  def debug(message)
+    puts message if @debug
+  end
+
   # Dumps the given table into the given IO.
   def dump_table(io, table_obj)
     create_data = table_obj.data
     create_data.delete(:name)
 
     # Get SQL for creating table and add it to IO.
-    sqls = @args[:db].tables.create(table_obj.name, create_data, return_sql: true)
+    sqls = @db.tables.create(table_obj.name, create_data, return_sql: true)
     sqls.each do |sql|
       io.write("#{sql};\n")
     end
@@ -82,10 +87,14 @@ class Baza::Dump
     end
 
 
+    debug "Dumping data for table: #{table_obj.name}"
+
     # Set up rows and way to fill rows.
     rows = []
-    block_data = proc do |row|
-      rows << row
+
+
+    @db.select(table_obj.name, nil, unbuffered: true) do |row|
+      rows << row.values
       @rows_count += 1
 
       if rows.length >= 1000
@@ -95,24 +104,14 @@ class Baza::Dump
     end
 
 
-    # If a primary column is found then use IDQuery. Otherwise use cloned unbuffered query.
-    args = {idquery: prim_col.name} if prim_col
-
-
-    # Clone the connecting with array-results and execute query.
-    @args[:db].clone_conn(result: "array") do |db|
-      db.select(table_obj.name, nil, args, &block_data)
-    end
-
-
     # Dump the last rows if any.
     dump_insert_multi(io, table_obj, rows) unless rows.empty?
   end
 
   # Dumps the given rows from the given table into the given IO.
   def dump_insert_multi(io, table_obj, rows)
-    print "Inserting #{rows.length} into #{table_obj.name}.\n" if @debug
-    sqls = @args[:db].insert_multi(table_obj.name, rows, return_sql: true, keys: @keys)
+    debug "Inserting #{rows.length} into #{table_obj.name}."
+    sqls = @db.insert_multi(table_obj.name, rows, return_sql: true, keys: @keys)
     sqls.each do |sql|
       io.write("#{sql};\n")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -344,6 +344,8 @@ files:
 - lib/baza/base_sql_driver.rb
 - lib/baza/cloner.rb
 - lib/baza/column.rb
+- lib/baza/commands.rb
+- lib/baza/commands/select.rb
 - lib/baza/database.rb
 - lib/baza/database_model.rb
 - lib/baza/database_model_functionality.rb