wraithdb 0.0.2 → 0.0.3

data/lib/rails/3.0/active_record/base.rb

@@ -5,7 +5,7 @@ module ActiveRecord
       #an actual connection. The implementation provided mirrors the Mysql2Adapter
       def replace_bind_variables_with_wraithdb(statement, values)
         begin
-          replace_bind_variables_without_wraithdb
+          replace_bind_variables_without_wraithdb(statement, values)
         rescue StandardError => e
           raise e if e.kind_of? PreparedStatementInvalid
           bound = values.dup

data/lib/wraithdb/adapters/default_adapter.rb

@@ -0,0 +1,11 @@
+module WraithDB
+  module Adapters
+    class Mysql2Adapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
+      include WraithFunctionality
+
+      def adapter_name
+        'WraithDefault'
+      end
+    end
+  end
+end

data/lib/wraithdb/adapters/mysql2_adapter.rb

@@ -0,0 +1,31 @@
+require 'active_record/connection_adapters/mysql2_adapter'
+
+module WraithDB
+  module Adapters
+    class Mysql2Adapter < ActiveRecord::ConnectionAdapters::Mysql2Adapter
+      include WraithFunctionality
+
+      def quote(value, column = nil)
+        if value.kind_of?(String) && column && column.type == :binary && column.class.respond_to?(:string_to_binary)
+          s = column.class.string_to_binary(value).unpack("H*")[0]
+          "x'#{s}'"
+        elsif value.kind_of?(BigDecimal)
+          value.to_s("F")
+        else
+          super
+        end
+      end
+
+      # Quotes a string, escaping any ' (single quote) and \ (backslash)
+      # characters.
+      def quote_string(s)
+        s.gsub(/\\/, '\&\&').gsub(/'/, "\\\\'") # ' (for ruby-mode)
+      end
+
+
+      def adapter_name
+        'WraithMysql2'
+      end
+    end
+  end
+end

data/lib/wraithdb/adapters/wraith_functionality.rb

@@ -0,0 +1,28 @@
+module WraithDB
+  module Adapters
+    module WraithFunctionality
+      attr_reader :tables
+
+      def initialize
+        @active = true
+        @tables = {}
+      end
+
+      def support_migrations?
+        true
+      end
+
+      def create_table(table_name, options = {})
+        table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
+        table_definition.primary_key(options[:primary_key] || ActiveRecord::Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
+
+        yield table_definition if block_given?
+
+        @tables[table_name.to_s] = table_definition
+      end
+
+      def add_index(*args)
+      end
+    end
+  end
+end

data/lib/wraithdb/schema.rb

@@ -10,14 +10,24 @@ module WraithDB
 
       def connection
         load
-        @connection ||= WraithDB::Adapter.new
+        @connection ||= build_connection
       end
 
-      def tables
-        connection.tables
+      def build_connection
+        type = ActiveRecord::Base.configurations[Rails.env]['adapter']
+        type = 'default' unless File.exist?(adapter_path(type))
+
+        require adapter_path(type)
+
+        WraithDB::Adapters.const_get("#{type.capitalize}Adapter").new
       end
 
-      def initialize(*args)
+      def adapter_path(type)
+        "#{File.expand_path('..', __FILE__)}/adapters/#{type}_adapter.rb"
+      end
+
+      def tables
+        connection.tables
       end
 
       def load

data/lib/wraithdb/version.rb

@@ -1,3 +1,3 @@
 module Wraithdb
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/wraithdb.rb

@@ -2,7 +2,7 @@ require 'active_record/connection_adapters/abstract/schema_definitions'
 require "wraithdb/version"
 require 'wraithdb/schema'
 require 'wraithdb/column'
-require 'wraithdb/adapter'
+require 'wraithdb/adapters/wraith_functionality'
 
 dir_path = File.expand_path('..', __FILE__)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wraithdb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -53,7 +53,9 @@ files:
 - lib/rails/3.0/arel/table.rb
 - lib/rails/3.2/active_record/model_schema.rb
 - lib/wraithdb.rb
-- lib/wraithdb/adapter.rb
+- lib/wraithdb/adapters/default_adapter.rb
+- lib/wraithdb/adapters/mysql2_adapter.rb
+- lib/wraithdb/adapters/wraith_functionality.rb
 - lib/wraithdb/column.rb
 - lib/wraithdb/schema.rb
 - lib/wraithdb/version.rb

data/lib/wraithdb/adapter.rb

@@ -1,43 +0,0 @@
-module WraithDB
-  class Adapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
-    attr_reader :tables
-
-    def initialize
-      super(nil)
-      @active = true
-      @tables = {}
-    end
-
-    def quote(value, column = nil)
-      if value.kind_of?(String) && column && column.type == :binary && column.class.respond_to?(:string_to_binary)
-        s = column.class.string_to_binary(value).unpack("H*")[0]
-        "x'#{s}'"
-      elsif value.kind_of?(BigDecimal)
-        value.to_s("F")
-      else
-        super
-      end
-    end
-
-    def adapter_name
-      'WraithDB'
-    end
-
-    def support_migrations?
-      true
-    end
-
-    def create_table(table_name, options = {})
-      table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
-      table_definition.primary_key(options[:primary_key] || ActiveRecord::Base.get_primary_key(table_name.to_s.singularize)) unless options[:id] == false
-
-      yield table_definition if block_given?
-
-      @tables[table_name.to_s] = table_definition
-    end
-
-    def add_index(*args)
-    end
-
-  end
-end