arboreal 0.0.3 → 0.0.4

data/lib/arboreal/class_methods.rb

@@ -30,19 +30,19 @@ module Arboreal
     # As a result, this *may* not work for DBMS that aren't explicitly supported.
     #
     def ancestry_extension_sql
-      sql = case connection.adapter_name
-      when /mysql/i
+      sql = if connection.adapter_name == "MySQL"
         <<-SQL
           UPDATE _arboreals_ AS child
           JOIN _arboreals_ AS parent ON parent.id = child.parent_id
           SET child.ancestry_string = CONCAT(parent.ancestry_string, parent.id, '-')
           WHERE child.ancestry_string IS NULL
         SQL
-      when /mssql/i
+      elsif connection.adapter_name == "JDBC" && connection.config[:url] =~ /sqlserver/
         <<-SQL
-          UPDATE _arboreals_ AS child
-          JOIN _arboreals_ AS parent ON parent.id = child.parent_id
+          UPDATE child
           SET child.ancestry_string = (parent.ancestry_string + CAST(parent.id AS varchar) + '-')
+          FROM _arboreals_ AS child
+          JOIN _arboreals_ AS parent ON parent.id = child.parent_id
           WHERE child.ancestry_string IS NULL
         SQL
       else # SQLite, PostgreSQL, most others (SQL-92)

data/lib/arboreal/version.rb

@@ -1,3 +1,3 @@
 module Arboreal
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/spec_helper.rb

@@ -23,14 +23,21 @@ DB_CONFIGS = {
     :database => 'tmp/test.sqlite'
   },
   "mysql" => {
-    :database => 'weblog_development',
     :host     => 'localhost',
+    :database => 'weblog_development',
     :username => 'blog',
     :password => ''
   },
   "postgresql" => {
+    :host     => 'localhost',
     :database => 'weblog_development',
+  },
+  "jdbcmssql" => {
     :host     => 'localhost',
+    :port     => 1433,
+    :database => 'weblog_development',
+    :username => 'blog',
+    :password => ''
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arboreal
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mike Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +10:00
+date: 2010-04-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency