skiima 0.1.000 → 0.2.2

data/spec/config/{database.yml → database.yml.example}

@@ -54,3 +54,19 @@ sqlserver_test:
   username: skiima
   password: test
 
+postgresql_root:
+  adapter: postgresql
+  encoding: utf8
+  database: postgres
+  username:
+  password:
+
+mysql_root:
+  adapter: mysql
+  encoding: utf8
+  reconnect: false
+  database: mysql
+  pool: 5
+  username:
+  password:
+  socket: /tmp/mysql.sock

data/spec/config/database.yml.travis

@@ -0,0 +1,69 @@
+---
+production:
+  adapter: postgresql
+  encoding: utf8
+  database: skiima_production
+  username: skiima
+  password: test
+
+development:
+  adapter: postgresql
+  encoding: utf8
+  database: skiima_development
+  username: skiima
+  password: test
+
+test:
+  adapter: postgresql
+  encoding: utf8
+  database: skiima_test
+  username: skiima
+  password: test
+
+postgresql_test:
+  adapter: postgresql
+  encoding: utf8
+  database: postgresql_test
+  username: skiima
+  password: test
+
+mysql_test:
+  adapter: mysql
+  encoding: utf8
+  reconnect: false
+  database: mysql_test
+  pool: 5
+  username: skiima
+  password: test
+
+mysql2_test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: mysql_test
+  pool: 5
+  username: skiima
+  password: test
+
+sqlserver_test:
+  adapter: sqlserver
+  encoding: utf8
+  database: skiima_test
+  username: skiima
+  password: test
+
+postgresql_root:
+  adapter: postgresql
+  encoding: utf8
+  database: postgres
+  username: postgres
+  password:
+
+mysql_root:
+  adapter: mysql
+  encoding: utf8
+  reconnect: false
+  database: mysql
+  pool: 5
+  username: root
+  password:

data/spec/db/skiima/{depends.yml → dependencies.yml}

@@ -48,8 +48,8 @@ test_rule:
 test_proc:
   mysql:
     current:
-      - proc.test_proc.test_proc
-      - proc.test_proc.test_proc_drop
+      - proc.test_proc
+      - proc.test_proc_drop
 blank_group:
   mysql:
   postgresql:
@@ -59,3 +59,8 @@ only_pg:
     current:
       - table.only_pg
       - view.pg_only
+test_script_groups:
+  - test_table
+  - test_column_names
+  - test_index
+  - test_schema

data/spec/db/skiima/init_test_db/database.skiima_test.mysql.current.sql

@@ -1,2 +1,9 @@
 DROP DATABASE IF EXISTS &database;
+--================
+DROP USER '&testuser'@'localhost';
+--================
+CREATE USER '&testuser'@'localhost' IDENTIFIED BY '&testpass';
+--================
 CREATE DATABASE &database;
+--================
+GRANT ALL PRIVILEGES ON &database.* TO '&testuser'@'localhost';

data/spec/db/skiima/init_test_db/database.skiima_test.postgresql.current.sql

@@ -1,2 +1,9 @@
 DROP DATABASE IF EXISTS &database;
+--================
+DROP USER IF EXISTS &testuser;
+--================
+CREATE USER &testuser WITH PASSWORD '&testpass';
+--================
 CREATE DATABASE &database;
+--================
+GRANT ALL PRIVILEGES ON DATABASE &database to &testuser;

data/spec/mysql2_spec.rb

@@ -5,10 +5,10 @@ describe "Mysql2: " do
   let(:db_config) { {} }
   let(:ski) { Skiima.new(:mysql2_test) }
 
-  describe "Connection Setup: " do
+  describe "connector Setup: " do
     it "should get the version" do
       ensure_closed(ski) do |s|
-        s.connection.version.must_be_instance_of Array
+        s.connector.version.must_be_instance_of Array
       end
     end
 
@@ -23,17 +23,19 @@ describe "Mysql2: " do
   end
 
   describe "Create/Drop Database: " do
-    
+    it "skips" do
+      skip
+    end
   end  
 
   describe "Create/Drop Tables: " do
     it 'should be able to create and drop tables' do
       ensure_closed(ski) do |s|
-        s.connection.table_exists?('test_table').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
         s.up(:test_table)
-        s.connection.table_exists?('test_table').must_equal true
+        s.connector.table_exists?('test_table').must_equal true
         s.down(:test_table)
-        s.connection.table_exists?('test_table').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
       end
     end
   end
@@ -41,17 +43,64 @@ describe "Mysql2: " do
   describe "Create/Drop View: " do
     it 'should be able to create and drop views' do
       ensure_closed(ski) do |s|
-        s.connection.table_exists?('test_table').must_equal false
-        s.connection.view_exists?('test_view').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
+        s.connector.view_exists?('test_view').must_equal false
 
         s.up(:test_table, :test_view)
-        s.connection.table_exists?('test_table').must_equal true
-        s.connection.view_exists?('test_view').must_equal true
+        s.connector.table_exists?('test_table').must_equal true
+        s.connector.view_exists?('test_view').must_equal true
 
         s.down(:test_table, :test_view)
-        s.connection.table_exists?('test_table').must_equal false
-        s.connection.view_exists?('test_view').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
+        s.connector.view_exists?('test_view').must_equal false
       end
     end
   end
+
+  #describe "Create/Drop Index: " do
+  #  it 'should create and drop indexes' do
+  #    ensure_closed(ski) do |s|
+  #      s.connector.table_exists?('test_table').must_equal false
+  #      s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal false
+  #
+  #      s.up(:test_table, :test_index)
+  #      s.connector.table_exists?('test_table').must_equal true
+  #      s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal true
+  #
+  #      s.down(:test_table, :test_index)
+  #      s.connector.table_exists?('test_table').must_equal false
+  #      s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal false
+  #    end
+  #  end
+  #end
+  #
+  #describe "Column Names: " do
+  #  it "should get a list of column names from a table" do
+  #    ensure_closed(ski) do |s|
+  #      s.connector.table_exists?('test_column_names').must_equal false
+  #      s.up(:test_column_names)
+  #
+  #      s.connector.column_names('test_column_names').must_include 'id', 'first_name'
+  #      s.down(:test_column_names)
+  #      # { s.connector.column_names('test_column_names') }.must_raise Error
+  #    end
+  #  end
+  #end
+  #
+  #describe "Create/Drop Procs: " do
+  #  it "should create and drop procs, with or without a drop script" do
+  #    ensure_closed(ski) do |s|
+  #      s.connector.proc_exists?('test_proc').must_equal false
+  #      s.connector.proc_exists?('test_proc_drop').must_equal false
+  #
+  #      s.up(:test_proc)
+  #      s.connector.proc_exists?('test_proc').must_equal true
+  #      s.connector.proc_exists?('test_proc_drop').must_equal true
+  #
+  #      s.down(:test_proc)
+  #      s.connector.proc_exists?('test_proc').must_equal false
+  #      s.connector.proc_exists?('test_proc_drop').must_equal false
+  #    end
+  #  end
+  #end
 end

data/spec/mysql_spec.rb

@@ -8,7 +8,7 @@ describe "Mysql: " do
   describe "Connection Setup: " do
     it "should get the version" do
       ensure_closed(ski) do |s|
-        s.connection.version.must_be_instance_of Array
+        s.connector.version.must_be_instance_of Array
       end
     end
 
@@ -19,17 +19,17 @@ describe "Mysql: " do
   end
 
   describe "Create/Drop Database: " do
-
+    it "skips" do; skip; end
   end  
 
   describe "Create/Drop Tables: " do
     it 'should create and drop tables' do
       ensure_closed(ski) do |s|
-        s.connection.table_exists?('test_table').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
         s.up(:test_table)
-        s.connection.table_exists?('test_table').must_equal true
+        s.connector.table_exists?('test_table').must_equal true
         s.down(:test_table)
-        s.connection.table_exists?('test_table').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
       end
     end
   end
@@ -37,16 +37,16 @@ describe "Mysql: " do
   describe "Create/Drop View: " do
     it 'should create and drop views' do
       ensure_closed(ski) do |s|
-        s.connection.table_exists?('test_table').must_equal false
-        s.connection.view_exists?('test_view').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
+        s.connector.view_exists?('test_view').must_equal false
 
         s.up(:test_table, :test_view)
-        s.connection.table_exists?('test_table').must_equal true
-        s.connection.view_exists?('test_view').must_equal true
+        s.connector.table_exists?('test_table').must_equal true
+        s.connector.view_exists?('test_view').must_equal true
 
         s.down(:test_table, :test_view)
-        s.connection.table_exists?('test_table').must_equal false
-        s.connection.view_exists?('test_view').must_equal false
+        s.connector.table_exists?('test_table').must_equal false
+        s.connector.view_exists?('test_view').must_equal false
       end
     end
   end
@@ -54,16 +54,16 @@ describe "Mysql: " do
   describe "Create/Drop Index: " do
     it 'should create and drop indexes' do
       ensure_closed(ski) do |s|
-        s.connection.table_exists?('test_table').must_equal false
-        s.connection.index_exists?('test_index', :attr => ['test_table']).must_equal false
+        s.connector.table_exists?('test_table').must_equal false
+        s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal false
 
         s.up(:test_table, :test_index)
-        s.connection.table_exists?('test_table').must_equal true
-        s.connection.index_exists?('test_index', :attr => ['test_table']).must_equal true
+        s.connector.table_exists?('test_table').must_equal true
+        s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal true
 
         s.down(:test_table, :test_index)
-        s.connection.table_exists?('test_table').must_equal false
-        s.connection.index_exists?('test_index', :attr => ['test_table']).must_equal false
+        s.connector.table_exists?('test_table').must_equal false
+        s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal false
       end
     end
   end
@@ -71,12 +71,12 @@ describe "Mysql: " do
   describe "Column Names: " do
     it "should get a list of column names from a table" do
       ensure_closed(ski) do |s|
-        s.connection.table_exists?('test_column_names').must_equal false
+        s.connector.table_exists?('test_column_names').must_equal false
         s.up(:test_column_names)
 
-        s.connection.column_names('test_column_names').must_include 'id', 'first_name'
+        s.connector.column_names('test_column_names').must_include 'id', 'first_name'
         s.down(:test_column_names)
-        # { s.connection.column_names('test_column_names') }.must_raise Error
+        # { s.connector.column_names('test_column_names') }.must_raise Error
       end
     end
   end
@@ -84,17 +84,56 @@ describe "Mysql: " do
   describe "Create/Drop Procs: " do
     it "should create and drop procs, with or without a drop script" do
       ensure_closed(ski) do |s|
-        s.connection.proc_exists?('test_proc').must_equal false
-        s.connection.proc_exists?('test_proc_drop').must_equal false
+        s.connector.proc_exists?('test_proc').must_equal false
+        s.connector.proc_exists?('test_proc_drop').must_equal false
 
         s.up(:test_proc)
-        s.connection.proc_exists?('test_proc').must_equal true
-        s.connection.proc_exists?('test_proc_drop').must_equal true
+        s.connector.proc_exists?('test_proc').must_equal true
+        s.connector.proc_exists?('test_proc_drop').must_equal true
 
         s.down(:test_proc)
-        s.connection.proc_exists?('test_proc').must_equal false
-        s.connection.proc_exists?('test_proc_drop').must_equal false
+        s.connector.proc_exists?('test_proc').must_equal false
+        s.connector.proc_exists?('test_proc_drop').must_equal false
       end
     end
   end
-end
+end
+
+## encoding: utf-8
+#require 'spec_helper'
+#require 'skiima/db_adapters/mysql_adapter'
+#
+#describe "Skiima::DbAdapters::MysqlAdapter" do
+#  let(:db) { Skiima.read_db_yml(Skiima.full_database_path)[:mysql_test] }
+#  let(:mysql_params) { [db[:host], db[:username], db[:password], db[:database], db[:port], db[:socket], Mysql::CLIENT_MULTI_RESULTS] }
+#  let(:mysql_adapter) { Skiima::DbAdapters::MysqlAdapter.new(Mysql.init, nil, mysql_params, db) }
+#
+#  describe "#initialize" do
+#    before(:each) do
+#      Mysql.any_instance.expects(:real_connect)
+#      Skiima::DbAdapters::MysqlAdapter.any_instance.expects(:version)
+#      Skiima::DbAdapters::MysqlAdapter.any_instance.expects(:configure_connection)
+#    end
+#
+#    it 'should set connection options and config' do
+#      mysql_adapter.instance_variable_get(:@connection_options).must_equal mysql_params
+#      mysql_adapter.instance_variable_get(:@config).must_equal db
+#    end
+#
+#    it 'should set ssl options if included' do
+#      db.merge!({:sslkey => '123'})
+#      Mysql.any_instance.expects(:ssl_set)
+#
+#      mysql_adapter
+#    end
+#
+#    it 'should set encoding options if included' do
+#      utf = 'utf-8'
+#      db.merge!({:encoding => utf})
+#      Mysql.any_instance.expects(:options).with(Mysql::SET_CHARSET_NAME, utf)
+#
+#      mysql_adapter
+#    end
+#  end
+#
+#end

data/spec/postgresql_spec.rb

@@ -4,17 +4,17 @@ require 'helpers/postgresql_spec_helper'
 
 describe "Postgresql: " do
   let(:ski) { Skiima.new(:postgresql_test) }
-  
+
   describe "Connection Setup: " do
     it "should get the version" do
       ensure_closed(ski) do |s|
-        s.connection.version.must_be_instance_of Fixnum
+        s.connector.version.must_be_instance_of Fixnum
       end
     end
 
     it "should get the timezone" do
       ensure_closed(ski) do |s|
-        s.connection.local_tz.must_be_instance_of String
+        s.connector.local_tz.must_be_instance_of String
       end
     end
   end
@@ -29,11 +29,11 @@ describe "Postgresql: " do
     it "should create and drop a table" do
       ensure_closed(ski) do |skiima|
         within_transaction(skiima) do |s|
-          s.connection.table_exists?('test_table').must_equal false
+          s.connector.table_exists?('test_table').must_equal false
           s.up(:test_table)
-          s.connection.table_exists?('test_table').must_equal true
+          s.connector.table_exists?('test_table').must_equal true
           s.down(:test_table)
-          s.connection.table_exists?('test_table').must_equal false
+          s.connector.table_exists?('test_table').must_equal false
         end
       end
     end
@@ -47,11 +47,11 @@ describe "Postgresql: " do
     #schema's cant be rolled back
     it "should create and drop schemas" do
       ensure_closed(ski) do |s|
-        s.connection.schema_exists?('test_schema').must_equal false
+        s.connector.schema_exists?('test_schema').must_equal false
         s.up(:test_schema)
-        s.connection.schema_exists?('test_schema').must_equal true
+        s.connector.schema_exists?('test_schema').must_equal true
         s.down(:test_schema)
-        s.connection.schema_exists?('test_schema').must_equal false
+        s.connector.schema_exists?('test_schema').must_equal false
       end
     end
   end
@@ -60,16 +60,16 @@ describe "Postgresql: " do
     it "should create and drop views" do
       ensure_closed(ski) do |skiima|
         within_transaction(skiima) do |s|
-          s.connection.table_exists?('test_table').must_equal false
-          s.connection.view_exists?('test_view').must_equal false
+          s.connector.table_exists?('test_table').must_equal false
+          s.connector.view_exists?('test_view').must_equal false
 
           s.up(:test_table, :test_view)
-          s.connection.table_exists?('test_table').must_equal true
-          s.connection.view_exists?('test_view').must_equal true
+          s.connector.table_exists?('test_table').must_equal true
+          s.connector.view_exists?('test_view').must_equal true
 
           s.down(:test_table, :test_view)
-          s.connection.table_exists?('test_table').must_equal false
-          s.connection.view_exists?('test_view').must_equal false
+          s.connector.table_exists?('test_table').must_equal false
+          s.connector.view_exists?('test_view').must_equal false
         end
       end
     end
@@ -79,19 +79,19 @@ describe "Postgresql: " do
     it "should create and drop rules" do
       ensure_closed(ski) do |skiima|
         within_transaction(skiima) do |s|
-          s.connection.table_exists?('test_table').must_equal false
-          s.connection.view_exists?('test_view').must_equal false
-          s.connection.rule_exists?('test_rule', :attr => ['test_view']).must_equal false
+          s.connector.table_exists?('test_table').must_equal false
+          s.connector.view_exists?('test_view').must_equal false
+          s.connector.rule_exists?('test_rule', :attr => ['test_view']).must_equal false
 
           s.up(:test_table, :test_view, :test_rule)
-          s.connection.table_exists?('test_table').must_equal true
-          s.connection.view_exists?('test_view').must_equal true
-          s.connection.rule_exists?('test_rule', :attr => ['test_view']).must_equal true
+          s.connector.table_exists?('test_table').must_equal true
+          s.connector.view_exists?('test_view').must_equal true
+          s.connector.rule_exists?('test_rule', :attr => ['test_view']).must_equal true
 
           s.down(:test_table, :test_view, :test_rule)
-          s.connection.table_exists?('test_table').must_equal false
-          s.connection.view_exists?('test_view').must_equal false
-          s.connection.rule_exists?('test_rule', :attr => ['test_view']).must_equal false
+          s.connector.table_exists?('test_table').must_equal false
+          s.connector.view_exists?('test_view').must_equal false
+          s.connector.rule_exists?('test_rule', :attr => ['test_view']).must_equal false
         end
       end
     end
@@ -101,38 +101,59 @@ describe "Postgresql: " do
     it "should create and drop indexes" do
       ensure_closed(ski) do |skiima|
         within_transaction(skiima) do |s|
-          s.connection.table_exists?('test_table').must_equal false
-          s.connection.index_exists?('test_index', :attr => ['test_table']).must_equal false
+          s.connector.table_exists?('test_table').must_equal false
+          s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal false
 
           s.up(:test_table, :test_index)
-          s.connection.table_exists?('test_table').must_equal true
-          s.connection.index_exists?('test_index', :attr => ['test_table']).must_equal true
+          s.connector.table_exists?('test_table').must_equal true
+          s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal true
 
           s.down(:test_table, :test_index)
-          s.connection.table_exists?('test_table').must_equal false
-          s.connection.index_exists?('test_index', :attr => ['test_table']).must_equal false
+          s.connector.table_exists?('test_table').must_equal false
+          s.connector.index_exists?('test_index', :attr => ['test_table']).must_equal false
         end
       end
     end
   end
 
   describe "Create/Drop Users: " do
-    
+
   end
 
   describe "Column Names: " do
     it "should get a list of column names from a table" do
       ensure_closed(ski) do |skiima|
         within_transaction(skiima) do |s|
-          s.connection.table_exists?('test_column_names').must_equal false
+          s.connector.table_exists?('test_column_names').must_equal false
           s.up(:test_column_names)
 
-          s.connection.column_names('test_column_names').must_include 'id', 'first_name'
+          s.connector.column_names('test_column_names').must_include 'id', 'first_name'
           s.down(:test_column_names)
           # { s.connection.column_names('test_column_names') }.must_raise Error
         end
-      end  
+      end
     end
   end
 end
 
+## encoding: utf-8
+#require 'spec_helper'
+#require 'skiima/db_adapters/postgresql_adapter'
+#
+#describe "Skiima::DbAdapters::PostgresqlAdapter" do
+#  let(:db) { Skiima.read_db_yml(Skiima.full_database_path)[:test] }
+#  let(:pg_params) { [db[:host], db[:port], nil, nil, db[:database], db[:username], db[:password]] }
+#  let(:pg_adapter) { Skiima::DbAdapters::PostgresqlAdapter.new(nil, nil, pg_params, db) }
+#
+#  describe "#initialize" do
+#    it 'should set params, attempt to connect, check the version, and get the timezone' do
+#      Skiima::DbAdapters::PostgresqlAdapter.any_instance.expects(:connect)
+#      Skiima::DbAdapters::PostgresqlAdapter.any_instance.expects(:postgresql_version).returns(80300)
+#      Skiima::DbAdapters::PostgresqlAdapter.any_instance.expects(:get_timezone).returns('UTC')
+#
+#      pg_adapter.version.must_equal 80300
+#      pg_adapter.local_tz.must_equal 'UTC'
+#    end
+#  end
+#end
+