baza 0.0.15 → 0.0.16

data/include/table.rb

@@ -0,0 +1,9 @@
+class Baza::Table
+  def to_s
+    "#<#{self.class.name} name=\"#{name}\">"
+  end
+
+  def inspect
+    to_s
+  end
+end

data/lib/baza.rb

@@ -5,7 +5,25 @@ class Baza
   def self.const_missing(name)
     file_name = name.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase
     require "#{File.dirname(__FILE__)}/../include/#{file_name}.rb"
-    raise "Still not defined: '#{name}'." if !Baza.const_defined?(name)
+    raise "Still not defined: '#{name}'." unless Baza.const_defined?(name)
     return Baza.const_get(name)
   end
+
+  def self.default_db=(db)
+    @default_db = db
+  end
+
+  def self.default_db
+    unless @default_db
+      config_file = "#{Dir.pwd}/config/baza_database.rb"
+
+      load(config_file)
+
+      unless @default_db.is_a?(Baza::Db)
+        raise "Config file didn't return a Baza::Db: #{@default_db.class.name}"
+      end
+    end
+
+    return @default_db
+  end
 end

data/shippable.yml

@@ -1,7 +1,10 @@
 language: ruby
 rvm:
-  - 2.1.2
+  - ruby-1.9.3
+  - ruby-2.1.2
+  - jruby-head
 before_script:
+  - sudo apt-get -f install libmysql-java
   - 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;'

data/spec/include/cloner_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Baza::Cloner do
+  it 'can clone drivers' do
+    require 'info_active_record'
+    conn = Baza::InfoActiveRecord.connection
+    baza_db = Baza::Cloner.from_active_record_connection(conn[:conn])
+    expect(baza_db.query('SELECT 1 AS test').fetch[:test]).to eq 1
+  end
+end

data/spec/info_active_record.rb

@@ -4,14 +4,26 @@ class Baza::InfoActiveRecord
   def self.connection
     require "active_record"
 
-    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
-      adapter: "mysql2",
-      host: "localhost",
-      database: "baza-test",
-      username: "baza-test",
-      password: "BBH7djRUKzL5nmG3"
-    )
-    @conn ||= @conn_pool.connection
+    if RUBY_ENGINE == "jruby"
+      require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
+      @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+        adapter: "mysql",
+        host: "localhost",
+        database: "baza-test",
+        username: "baza-test",
+        password: "BBH7djRUKzL5nmG3"
+      )
+      @conn ||= @conn_pool.connection
+    else
+      @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+        adapter: "mysql2",
+        host: "localhost",
+        database: "baza-test",
+        username: "baza-test",
+        password: "BBH7djRUKzL5nmG3"
+      )
+      @conn ||= @conn_pool.connection
+    end
 
     return {pool: @conn_pool, conn: @conn}
   end

data/spec/info_active_record_shippable.rb

@@ -4,13 +4,24 @@ class Baza::InfoActiveRecord
   def self.connection
     require "active_record"
 
-    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
-      adapter: "mysql2",
-      host: "localhost",
-      database: "baza",
-      username: "shippa"
-    )
-    @conn ||= @conn_pool.connection
+    if RUBY_ENGINE == "jruby"
+      require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
+      @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+        adapter: "mysql",
+        host: "localhost",
+        database: "baza",
+        username: "shippa"
+      )
+      @conn ||= @conn_pool.connection
+    else
+      @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+        adapter: "mysql2",
+        host: "localhost",
+        database: "baza",
+        username: "shippa"
+      )
+      @conn ||= @conn_pool.connection
+    end
 
     return {pool: @conn_pool, conn: @conn}
   end

data/spec/info_mysql_shippable.rb

@@ -2,13 +2,22 @@ class Baza::InfoMysql
   attr_reader :db
 
   def initialize
-    @db = Baza::Db.new(
-      type: :mysql,
-      subtype: :mysql2,
-      host: "localhost",
-      user: "shippa",
-      db: "baza"
-    )
+    if RUBY_ENGINE == "jruby"
+      @db = Baza::Db.new(
+        type: :mysql,
+        host: "localhost",
+        user: "shippa",
+        db: "baza"
+      )
+    else
+      @db = Baza::Db.new(
+        type: :mysql,
+        subtype: :mysql2,
+        host: "localhost",
+        user: "shippa",
+        db: "baza"
+      )
+    end
   end
 
   def before

data/spec/info_sqlite3.rb

@@ -2,7 +2,7 @@ class Baza::InfoSqlite3
   attr_reader :db
 
   def initialize
-    require "sqlite3"
+    require "sqlite3" unless RUBY_ENGINE == "jruby"
     require "tmpdir"
 
     @path = "#{Dir.tmpdir}/baza_sqlite3_test_#{Time.now.to_f.to_s.hash}.sqlite3"

data/spec/support/driver_indexes_collection.rb

@@ -12,7 +12,12 @@ shared_examples_for "a baza indexes driver" do
     db.tables.create("test", {
       columns: [
         {name: "id", type: :int, autoincr: true, primarykey: true},
-        {name: "text", type: :varchar}
+        {name: "text", type: :varchar},
+        {name: "email", type: :varchar}
+      ],
+      indexes: [
+        :text,
+        {name: :email, unique: true, columns: [:email]}
       ]
     })
     db.tables[:test]
@@ -33,7 +38,6 @@ shared_examples_for "a baza indexes driver" do
 
     test_table.create_indexes([{name: "index_on_text", columns: [:text]}])
     test_table.rename("test2")
-
     test_table.index("index_on_text").rename("index_on_text2")
 
     table = db.tables[:test2]
@@ -46,4 +50,14 @@ shared_examples_for "a baza indexes driver" do
       test_table.index("index_that_doesnt_exist")
     }.to raise_error(Errno::ENOENT)
   end
+
+  describe "#unique?" do
+    it "returns true when it is unique" do
+      test_table.index("email").unique?.should eq true
+    end
+
+    it "returns false when it isn't unique" do
+      test_table.index("text").unique?.should eq false
+    end
+  end
 end

metadata

@@ -1,85 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.25
 - !ruby/object:Gem::Dependency
   name: wref
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: knjrbfw
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.111
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.111
 - !ruby/object:Gem::Dependency
   name: array_enumerator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +195,8 @@ files:
 - Rakefile
 - VERSION
 - baza.gemspec
+- include/cloner.rb
+- include/column.rb
 - include/db.rb
 - include/dbtime.rb
 - include/driver.rb
@@ -211,8 +213,6 @@ files:
 - 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
@@ -225,6 +225,7 @@ files:
 - include/drivers/sqlite3/sqlite3_tables.rb
 - include/dump.rb
 - include/idquery.rb
+- include/index.rb
 - include/model.rb
 - include/model_custom.rb
 - include/model_handler.rb
@@ -233,8 +234,10 @@ files:
 - include/revision.rb
 - include/row.rb
 - include/sqlspecs.rb
+- include/table.rb
 - lib/baza.rb
 - shippable.yml
+- spec/include/cloner_spec.rb
 - spec/include/drivers/active_record_spec.rb
 - spec/include/drivers/mysql_spec.rb
 - spec/include/drivers/sqlite3_spec.rb
@@ -270,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.

data/include/drivers/sqlite3/libknjdb_java_sqlite3.rb

@@ -1,78 +0,0 @@
-class KnjDB_java_sqlite3
-  def escape_table
-    return "`"
-  end
-
-  def escape_col
-    return "`"
-  end
-
-  def escape_val
-    return "'"
-  end
-
-  def initialize(baza_db_obj)
-    @baza_db = baza_db_obj
-
-    if @baza_db.opts[:sqlite_driver]
-      require @baza_db.opts[:sqlite_driver]
-    else
-      require File.dirname(__FILE__) + "/sqlitejdbc-v056.jar"
-    end
-
-    require "java"
-    import "org.sqlite.JDBC"
-    @conn = java.sql.DriverManager::getConnection("jdbc:sqlite:" + @baza_db.opts[:path])
-    @stat = @conn.createStatement
-  end
-
-  def query(string)
-    begin
-      return KnjDB_java_sqlite3_result.new(@stat.executeQuery(string))
-    rescue java.sql.SQLException => e
-      if e.message == "java.sql.SQLException: query does not return ResultSet"
-        #ignore it.
-      else
-        raise e
-      end
-    end
-  end
-
-  def fetch(result)
-    return result.fetch
-  end
-
-  def escape(string)
-    return "" unless string
-    string = string.gsub("'", "\\'")
-    return string
-  end
-
-  def last_id
-    return @conn.last_insert_row_id
-  end
-end
-
-class KnjDB_java_sqlite3_result
-  def initialize(rs)
-    @rs = rs
-    @index = 0
-
-    if rs
-      @metadata = rs.getMetaData
-      @columns_count = @metadata.getColumnCount
-    end
-  end
-
-  def fetch
-    return false unless @rs.next
-
-    tha_return = {}
-    for i in (1..@columns_count)
-      col_name = @metadata.getColumnName(i)
-      tha_return.store(col_name, @rs.getString(i))
-    end
-
-    return tha_return
-  end
-end

data/include/drivers/sqlite3/libknjdb_sqlite3_ironruby.rb

@@ -1,69 +0,0 @@
-require "Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
-require "Mono.Data.SqliteClient, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
-
-class Baza::Driver::Sqlite3_ironruby
-  def escape_table
-    return "`"
-  end
-
-  def escape_col
-    return "`"
-  end
-
-  def escape_val
-    return "'"
-  end
-
-  def initialize(baza_db_obj)
-    @baza_db = baza_db_obj
-    @conn = Mono::Data::SqliteClient::SqliteConnection.new("URI=file:" + @baza_db.opts[:path] + ",version=3")
-    @conn.Open
-  end
-
-  def query(string)
-    dbcmd = @conn.CreateCommand
-    dbcmd.CommandText = string
-    reader = dbcmd.ExecuteReader
-    return Baza::Driver::Sqlite3_ironruby_result.new(reader)
-  end
-
-  def escape(string)
-    if (!string)
-      return ""
-    end
-
-      string = string.gsub("'", "\\'")
-    return string
-  end
-
-  def last_id
-    return @conn.last_insert_row_id
-  end
-end
-
-class Baza::Driver::Sqlite3_ironruby_result
-  def initialize(reader)
-    @reader = reader
-  end
-
-  def fetch
-    if !@reader.Read
-      return false
-    end
-
-    ret = {}
-
-    count = 0
-    while true
-      begin
-        ret[@reader.get_name(count)] = @reader.get_string(count)
-      rescue IndexError => e
-        break
-      end
-
-      count += 1
-    end
-
-    return ret
-  end
-end