datamapper 0.2.0 → 0.2.1

data/plugins/dataobjects/Rakefile

@@ -1,5 +1,7 @@
 require 'spec/rake/spectask'
 
+task :default => 'specs'
+
 desc "Run all specs"
 Spec::Rake::SpecTask.new('specs') do |t|
   t.spec_opts = ["--format", "specdoc", "--colour"]

data/plugins/dataobjects/do.rb

@@ -87,15 +87,14 @@ module DataObject
   class Reader
     include Enumerable
     
-    attr_reader :field_count, :has_rows, :records_affected, :fields
-    alias_method :has_rows?, :has_rows
+    attr_reader :field_count, :records_affected, :fields
     
     def each
-      return nil unless has_rows
-      while(true) do
-        yield
-        break unless self.next
-      end
+      raise NotImplementedError
+    end
+    
+    def has_rows?
+      @has_rows
     end
     
     def current_row
@@ -106,7 +105,18 @@ module DataObject
       ret
     end
     
-    def close
+    def open?
+      @state != STATE_CLOSED
+    end
+    
+    def close        
+      real_close
+      @reader = nil
+      @state = STATE_CLOSED
+      true
+    end
+    
+    def real_close
       raise NotImplementedError
     end
     

data/plugins/dataobjects/do_mysql.rb

@@ -9,9 +9,22 @@ module DataObject
     QUOTE_COLUMN = "`"
     
     class Connection < DataObject::Connection
+      
+      def self.conns
+        @conns
+      end
+      
+      def self.conns=(val)
+        @conns = val
+      end
+      
+      self.conns = 0
+      
       attr_reader :db
       
       def initialize(connection_string)
+        @num = (self.class.conns += 1)
+        
         @state = STATE_CLOSED
         @connection_string = connection_string
         opts = connection_string.split(" ")
@@ -52,9 +65,17 @@ module DataObject
       
     end
     
-    class Reader < DataObject::Reader
+    class Field
+      attr_reader :name, :type
+      
+      def initialize(ptr)
+        @name, @type = ptr.name.to_s, ptr.type.to_s
+      end
+    end
     
-      def initialize(db, reader)
+    class Reader < DataObject::Reader
+      
+      def initialize(db, reader)        
         @reader = reader
         unless @reader
           if Mysql_c.mysql_field_count(db) == 0
@@ -64,20 +85,19 @@ module DataObject
             raise UnknownError, "An unknown error has occured while trying to process a MySQL query.\n#{Mysql_c.mysql_error(db)}"
           end
         else
-          @field_count = Mysql_c.mysql_num_fields(@reader)
+          @field_count = @reader.field_count
           @state = STATE_OPEN
-          self.next
-          fields = Mysql_c.mysql_fetch_fields(@reader)
-          @native_fields = fields
-          raise UnknownError, "An unknown error has occured while trying to process a MySQL query. There were no fields in the resultset\n#{Mysql_c.mysql_error(db)}" unless fields
-          @fields = fields.map {|field| field.name}
-          @rows = Mysql_c.mysql_num_rows(@reader)
-          @has_rows = @rows > 0
+          
+          @native_fields, @fields = Mysql_c.mysql_c_fetch_field_types(@reader, @field_count), Mysql_c.mysql_c_fetch_field_names(@reader, @field_count)
+
+          raise UnknownError, "An unknown error has occured while trying to process a MySQL query. There were no fields in the resultset\n#{Mysql_c.mysql_error(db)}" if @native_fields.empty?
+          
+          @has_rows = !(@row = Mysql_c.mysql_c_fetch_row(@reader)).nil?
         end
       end
       
       def close
-        if @state != STATE_CLOSED
+        if @state == STATE_OPEN
           Mysql_c.mysql_free_result(@reader)
           @state = STATE_CLOSED
           true
@@ -101,6 +121,10 @@ module DataObject
         @row[idx] == nil
       end
       
+      def current_row
+        @row
+      end
+      
       def item(idx)
         super
         typecast(@row[idx], idx)
@@ -108,9 +132,18 @@ module DataObject
       
       def next
         super
-        @row = Mysql_c.mysql_fetch_row(@reader)
+        @row = Mysql_c.mysql_c_fetch_row(@reader)
         close if @row.nil?
         @row ? true : nil
+      end      
+      
+      def each
+        return unless has_rows?
+        
+        while(true) do
+          yield
+          break unless self.next
+        end
       end
       
       protected
@@ -122,13 +155,9 @@ module DataObject
       def typecast(val, idx)
         return nil if val.nil?
         field = @native_fields[idx]
-        case TYPES[field.type]
+        case TYPES[field]
           when "TINY"
-            if field.max_length == 1
-              val != "0"
-            else
-              val.to_i
-            end
+            val != "0"
           when "BIT"
             val.to_i(2)
           when "SHORT", "LONG", "INT24", "LONGLONG"
@@ -146,9 +175,7 @@ module DataObject
           else
             val
         end
-      end
-      
-      
+      end      
     end
     
     class Command < DataObject::Command
@@ -157,9 +184,15 @@ module DataObject
         super
         result = Mysql_c.mysql_query(@connection.db, @text)
         # TODO: Real Error
-        raise QueryError, "Your query failed.\n#{Mysql_c.mysql_error(@connection.db)}\n#{@text}" unless result == 0 
-        reader = Mysql_c.mysql_store_result(@connection.db)
-        Reader.new(@connection.db, reader)
+        raise QueryError, "Your query failed.\n#{Mysql_c.mysql_error(@connection.db)}\n#{@text}" unless result == 0
+        reader = Reader.new(@connection.db, Mysql_c.mysql_use_result(@connection.db))
+        if block_given?
+          result = yield(reader)
+          reader.close
+          result
+        else
+          reader
+        end
       end
       
       def execute_non_query

data/plugins/dataobjects/do_postgres.rb

@@ -61,13 +61,9 @@ module DataObject
       end
       
       def close
-        if @state != STATE_CLOSED
-          Postgres_c.PQclear(@reader)
-          @state = STATE_CLOSED
-          true
-        else
-          false
-        end
+        Postgres_c.PQclear(@reader)
+        @state = STATE_CLOSED
+        true
       end
       
       def data_type_name(col)

data/plugins/dataobjects/do_sqlite3.rb

@@ -69,14 +69,8 @@ module DataObject
         end
       end
       
-      def close
-        if @state != STATE_CLOSED
-          Sqlite3_c.sqlite3_finalize(@reader)
-          @state = STATE_CLOSED
-          true
-        else
-          false
-        end
+      def real_close
+        Sqlite3_c.sqlite3_finalize(@reader)
       end
       
       def name(idx)
@@ -106,13 +100,12 @@ module DataObject
         end
       end
       
-      def next
-        result = Sqlite3_c.sqlite3_step(@reader)
-        unless result == Sqlite3_c::SQLITE_ROW
-          close
-          nil
-        else
-          true
+      def each
+        return unless has_rows?
+        
+        while(true) do
+          yield
+          break unless Sqlite3_c.sqlite3_step(@reader) == Sqlite3_c::SQLITE_ROW
         end
       end
       
@@ -122,11 +115,19 @@ module DataObject
       
       def execute_reader
         super
-        result, reader = Sqlite3_c.sqlite3_prepare_v2(@connection.db, @text, @text.size + 1)
+        result, ptr = Sqlite3_c.sqlite3_prepare_v2(@connection.db, @text, @text.size + 1)
         unless result == Sqlite3_c::SQLITE_OK
           raise QueryError, "Your query failed.\n#{Sqlite3_c.sqlite3_errmsg(@connection.db)}\nQUERY: \"#{@text}\""
         else
-          Reader.new(@connection.db, reader)
+          reader = Reader.new(@connection.db, ptr)
+          
+          if block_given?
+            return_value = yield(reader)
+            reader.close
+            return_value
+          else
+            reader
+          end
         end
       end
       

data/plugins/dataobjects/swig_mysql/Makefile

@@ -0,0 +1,146 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /opt/local/lib/ruby/1.8/i686-darwin8.9.1
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/opt/local
+exec_prefix = $(DESTDIR)/opt/local
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+vendordir = $(prefix)/lib/ruby/vendor_ruby
+datadir = $(prefix)/share
+includedir = $(prefix)/include
+infodir = $(prefix)/info
+sysconfdir = $(prefix)/etc
+mandir = $(DESTDIR)/opt/local/share/man
+libdir = $(DESTDIR)/opt/local/lib
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorarchdir = $(vendorlibdir)/$(vendorarch)
+bindir = $(exec_prefix)/bin
+localstatedir = $(prefix)/var
+vendorlibdir = $(vendordir)/$(ruby_version)
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = gcc
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common -Wall  
+INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.9.1 -I.
+CPPFLAGS =  -I/usr/local/mysql/include -O -pipe -I/opt/local/include
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L/opt/local/lib  
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i686-darwin8.9.1
+sitearch = i686-darwin8.9.1
+vendorarch = i686-darwin8.9.1
+ruby_version = 1.8
+ruby = /opt/local/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = $(libdir) /usr/local/mysql/lib -lmysqlclient_r -lz -lm
+LIBPATH =  -L"$(libdir)" -L""/usr/local/mysql/lib -lmysqlclient_r -lz -lm""
+DEFFILE = 
+
+CLEANFILES = 
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED) -lmysqlclient  -lpthread -ldl -lobjc  
+SRCS = mysql_c.c
+OBJS = mysql_c.o
+TARGET = mysql_c
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(MAKEDIRS) $@
+
+site-install: site-install-so site-install-rb
+site-install-so: install-so
+site-install-rb: install-rb
+
+.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS)
+	@-$(RM) $@
+	$(LDSHARED) $(DLDFLAGS) $(LIBPATH) -o $@ $(OBJS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h

data/plugins/dataobjects/swig_mysql/extconf.rb

@@ -1,11 +1,23 @@
 require 'mkmf'
+require 'open3'
 
 def config_value(type)
   ENV["MYSQL_#{type.upcase}"] || mysql_config(type)
 end
 
 def mysql_config(type)
-  IO.popen("mysql_config5 --#{type}").readline.chomp[2..-1] rescue IO.popen("mysql_config --#{type}").readline.chomp[2..-1] rescue nil
+
+  sin, sout, serr = Open3.popen3("mysql_config5 --#{type}")
+  
+  unless serr.read.empty?
+    sin, sout, serr = Open3.popen3("mysql_config --#{type}")
+  end
+  
+  unless serr.read.empty?
+    raise "mysql_config not found"
+  end
+  
+  sout.readline.chomp[2..-1]
 end
 
 $inc, $lib = dir_config('mysql', config_value('include'), config_value('libs_r')) 

data/plugins/dataobjects/swig_mysql/mkmf.log

@@ -0,0 +1,24 @@
+find_library: checking for mysql_query() in -lmysqlclient... -------------------- yes
+
+"gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.9.1 -I. -I/usr/local/mysql/include -O -pipe -I/opt/local/include -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common conftest.c  -L"/opt/local/lib" -L""/usr/local/mysql/lib -lmysqlclient_r -lz -lm"" -L/opt/local/lib     -lruby-static -lmysqlclient  -lpthread -ldl -lobjc  "
+conftest.c: In function ‘t’:
+conftest.c:3: error: ‘mysql_query’ undeclared (first use in this function)
+conftest.c:3: error: (Each undeclared identifier is reported only once
+conftest.c:3: error: for each function it appears in.)
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { void ((*volatile p)()); p = (void ((*)()))mysql_query; return 0; }
+/* end */
+
+"gcc -o conftest -I. -I/opt/local/lib/ruby/1.8/i686-darwin8.9.1 -I. -I/usr/local/mysql/include -O -pipe -I/opt/local/include -O -pipe -I/opt/local/include  -fno-common -pipe -fno-common conftest.c  -L"/opt/local/lib" -L""/usr/local/mysql/lib -lmysqlclient_r -lz -lm"" -L/opt/local/lib     -lruby-static -lmysqlclient  -lpthread -ldl -lobjc  "
+checked program was:
+/* begin */
+1: /*top*/
+2: int main() { return 0; }
+3: int t() { mysql_query(); return 0; }
+/* end */
+
+--------------------
+