From 967ac14819028bb98334c128fff1ad2ef63f66c8 Mon Sep 17 00:00:00 2001
From: Denis Knauf <Denis.Knauf@gmail.com>
Date: Sun, 11 Sep 2011 12:39:13 +0200
Subject: [PATCH] logger in Rails fixed

---
 lib/smql_to_ar.rb               | 16 +++++++++++-----
 lib/smql_to_ar/query_builder.rb |  3 +--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/smql_to_ar.rb b/lib/smql_to_ar.rb
index af8342a..f666de3 100644
--- a/lib/smql_to_ar.rb
+++ b/lib/smql_to_ar.rb
@@ -157,12 +157,18 @@ class SmqlToAR
 
 	attr_reader :model, :query, :conditions, :builder, :order
 	attr_accessor :logger
-	@@logger = if Object.const_defined?( :Rails)
-			Rails.logger
-		else
-			require 'logger'
-			Logger.new $stdout
+	if defined? Rails
+		class Railtie < ::Rails::Railtie
+			initializer "active_record.logger" do
+				SmqlToAR.logger = ::Rails.logger
+				$stderr.puts( { self: self, logger: SmqlToAR.logger}.inspect)
+			end
 		end
+	else
+		require 'logger'
+		@@logger = Logger.new $stdout
+		$stderr.puts( { logger: @@logger}.inspect)
+	end
 
 	class <<self
 		def logger=(logger)  @@logger = logger  end
diff --git a/lib/smql_to_ar/query_builder.rb b/lib/smql_to_ar/query_builder.rb
index a8d9918..9f6c63e 100644
--- a/lib/smql_to_ar/query_builder.rb
+++ b/lib/smql_to_ar/query_builder.rb
@@ -30,10 +30,9 @@ class SmqlToAR
 
 		attr_reader :table_alias, :model, :table_model, :base_table, :_where, :_select, :_wobs, :_joins
 		attr_accessor :logger
-		@@logger = SmqlToAR.logger
 
 		def initialize model
-			@logger = @@logger
+			@logger = SmqlToAR.logger
 			@table_alias = Hash.new do |h, k|
 				k = Array.wrap k
 				h[k] = "smql,#{k.join(',')}"