swift 0.5.1 → 0.6.0

data/README.rdoc

@@ -71,7 +71,7 @@ primitive Ruby type conversion.
     attribute :id,         Swift::Type::Integer, serial: true, key: true
     attribute :name,       Swift::Type::String
     attribute :email,      Swift::Type::String
-    attribute :updated_at, Swift::Type::Time
+    attribute :updated_at, Swift::Type::DateTime
   end # User
 
   Swift.db do |db|

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/examples/scheme.rb

@@ -9,12 +9,12 @@ require 'swift/validations'
 
 class User < Swift::Scheme
   store     :users
-  attribute :id,       Swift::Type::Integer, serial: true, key: true
+  attribute :id,       Swift::Type::Integer,  serial: true, key: true
   attribute :name,     Swift::Type::String
   attribute :email,    Swift::Type::String
   attribute :active,   Swift::Type::Boolean
-  attribute :created,  Swift::Type::Time,   default: proc { Time.now }
-  attribute :optional, Swift::Type::String, default: 'woot'
+  attribute :created,  Swift::Type::DateTime, default: proc { Time.now }
+  attribute :optional, Swift::Type::String,   default: 'woot'
 
   validations do |errors|
     errors << [:name, 'is blank'] if name.to_s.empty?

data/ext/adapter.cc

@@ -86,10 +86,9 @@ static VALUE adapter_execute(int argc, VALUE *argv, VALUE self) {
     if (RARRAY_LEN(bind_values) > 0) query_bind_values(&query, bind_values);
     if (dbi::_trace)                 dbi::logMessage(dbi::_trace_fd, dbi::formatParams(query.sql, query.bind));
 
-    // TODO: http://redmine.ruby-lang.org/issues/show/3762
-    //       rb_thread_blocking_region and C++ exceptions don't mix in 1.9.2.
-    // rows = rb_thread_blocking_region(((VALUE (*)(void*))query_execute), &query, RUBY_UBF_IO, 0);
-    rows = query_execute(&query);
+    if ((rows = rb_thread_blocking_region(((VALUE (*)(void*))query_execute), &query, RUBY_UBF_IO, 0)) == Qfalse)
+      rb_raise(eSwiftRuntimeError, "%s", query.error);
+
     if (rb_block_given_p()) {
       dbi::AbstractResultSet *result = handle->results();
       return result_each(Data_Wrap_Struct(cSwiftResult, 0, result_free, result));

data/ext/extconf.rb

@@ -55,6 +55,6 @@ exit 1 unless library_installed? 'pcrecpp', apt_install_hint('libpcre3-dev')
 exit 1 unless library_installed? 'uuid',    apt_install_hint('uuid-dev')
 exit 1 unless library_installed? 'dbic++',  apt_install_hint('dbic++-dev')
 
-assert_dbicpp_version '0.3.0'
+assert_dbicpp_version '0.3.1'
 
 create_makefile 'swift'

data/ext/query.cc

@@ -1,19 +1,31 @@
 #include "query.h"
 
 VALUE query_execute(Query *query) {
-  return UINT2NUM(
-    query->bind.size() == 0
-      ? query->handle->conn()->execute(query->sql)
-      : query->handle->conn()->execute(query->sql, query->bind)
-  );
+  try {
+    return UINT2NUM(
+      query->bind.size() == 0
+        ? query->handle->conn()->execute(query->sql)
+        : query->handle->conn()->execute(query->sql, query->bind)
+    );
+  }
+  catch (dbi::Error &e) {
+    query->error = e.what();
+    return Qfalse;
+  }
 }
 
 VALUE query_execute_statement(Query *query) {
-  return UINT2NUM(
-    query->bind.size() == 0
-      ? query->statement->execute()
-      : query->statement->execute(query->bind)
-  );
+  try {
+    return UINT2NUM(
+      query->bind.size() == 0
+        ? query->statement->execute()
+        : query->statement->execute(query->bind)
+    );
+  }
+  catch (dbi::Error &e) {
+    query->error = e.what();
+    return Qfalse;
+  }
 }
 
 void query_bind_values(Query *query, VALUE bind_values) {
@@ -23,6 +35,12 @@ void query_bind_values(Query *query, VALUE bind_values) {
     if (bind_value == Qnil) {
       query->bind.push_back(dbi::PARAM(dbi::null()));
     }
+    else if (bind_value == Qtrue) {
+      query->bind.push_back(dbi::PARAM("1"));
+    }
+    else if (bind_value == Qfalse) {
+      query->bind.push_back(dbi::PARAM("0"));
+    }
     else if (rb_obj_is_kind_of(bind_value, rb_cIO) ==  Qtrue || rb_obj_is_kind_of(bind_value, cStringIO) ==  Qtrue) {
       bind_value = rb_funcall(bind_value, rb_intern("read"), 0);
       query->bind.push_back(dbi::PARAM_BINARY((unsigned char*)RSTRING_PTR(bind_value), RSTRING_LEN(bind_value)));

data/ext/query.h

@@ -8,6 +8,7 @@ struct Query {
   dbi::Handle            *handle;
   dbi::AbstractStatement *statement;
   dbi::ResultRow         bind;
+  const char             *error;
 };
 
 VALUE query_execute(Query*);

data/ext/result.cc

@@ -1,9 +1,10 @@
 #include "result.h"
 
-VALUE cSwiftResult;
+VALUE cBigDecimal;
+VALUE cDate;
 VALUE cDateTime;
 VALUE cStringIO;
-VALUE cBigDecimal;
+VALUE cSwiftResult;
 
 VALUE fNew, fNewBang;
 
@@ -91,6 +92,7 @@ static VALUE result_finish(VALUE self) {
 int64_t client_tzoffset(int64_t local, int isdst) {
   struct tm tm;
   gmtime_r((const time_t*)&local, &tm);
+  // TODO: This won't work in Lord Howe Island, Australia which uses half hour shift.
   return (int64_t)(local + (isdst ? 3600 : 0) - mktime(&tm));
 }
 
@@ -106,7 +108,7 @@ static void reduce(uint64_t *numerator, uint64_t *denominator) {
   *denominator = *denominator / b;
 }
 
-VALUE typecast_datetime(const char *data, uint64_t len) {
+VALUE typecast_timestamp(VALUE klass, const char *data, uint64_t len) {
   struct tm tm;
   int64_t epoch, adjust, offset;
 
@@ -141,24 +143,27 @@ VALUE typecast_datetime(const char *data, uint64_t len) {
     }
 
     // 32bit platforms are for weenies
-    uint64_t ajd_n = (epoch + adjust - offset), ajd_d = 86400L;
+    uint64_t ajd_n = (epoch + adjust - offset)*1000000 + usec*1000000, ajd_d = DAYMICROSECS;
     reduce(&ajd_n, &ajd_d);
     ajd_n = epoch_ajd_n*ajd_d  + ajd_n*epoch_ajd_d;
     ajd_d = epoch_ajd_d*ajd_d;
     reduce(&ajd_n, &ajd_d);
 
     VALUE ajd = rb_rational_new(SIZET2NUM(ajd_n), SIZET2NUM(ajd_d));
-    return rb_funcall(cDateTime, fNewBang, 3, ajd, rb_rational_new(INT2FIX(adjust), daysecs), sg);
+    return rb_funcall(klass, fNewBang, 3, ajd, rb_rational_new(INT2FIX(adjust), daysecs), sg);
   }
 
   // TODO: throw a warning ?
   return rb_str_new(data, len);
 }
 
+#define typecast_datetime(data,len) typecast_timestamp(cDateTime, data, len)
+#define typecast_date(data,len)     typecast_timestamp(cDate,     data, len)
+
 VALUE typecast_field(int type, const char *data, uint64_t length) {
   switch(type) {
     case DBI_TYPE_BOOLEAN:
-      return strcmp(data, "t") == 0 || strcmp(data, "1") == 0 ? Qtrue : Qfalse;
+      return (data && (data[0] =='t' || data[0] == '1')) ? Qtrue : Qfalse;
     case DBI_TYPE_INT:
       return rb_cstr2inum(data, 10);
     case DBI_TYPE_BLOB:
@@ -167,6 +172,8 @@ VALUE typecast_field(int type, const char *data, uint64_t length) {
       return rb_enc_str_new(data, length, rb_utf8_encoding());
     case DBI_TYPE_TIME:
       return typecast_datetime(data, length);
+    case DBI_TYPE_DATE:
+      return typecast_date(data, length);
     case DBI_TYPE_NUMERIC:
       return rb_funcall(cBigDecimal, fNew, 1, rb_str_new2(data));
     case DBI_TYPE_FLOAT:
@@ -219,6 +226,7 @@ void init_swift_result() {
   VALUE mSwift = rb_define_module("Swift");
   cSwiftResult = rb_define_class_under(mSwift, "Result", rb_cObject);
   cDateTime    = CONST_GET(rb_mKernel, "DateTime");
+  cDate        = CONST_GET(rb_mKernel, "Date");
   cStringIO    = CONST_GET(rb_mKernel, "StringIO");
   cBigDecimal  = CONST_GET(rb_mKernel, "BigDecimal");
 

data/ext/statement.cc

@@ -37,10 +37,8 @@ static VALUE statement_execute(int argc, VALUE *argv, VALUE self) {
     if (RARRAY_LEN(bind_values) > 0) query_bind_values(&query, bind_values);
     if (dbi::_trace)                 dbi::logMessage(dbi::_trace_fd, dbi::formatParams(statement->command(), query.bind));
 
-    // TODO: http://redmine.ruby-lang.org/issues/show/3762
-    //       rb_thread_blocking_region and C++ exceptions don't mix in 1.9.2.
-    // rb_thread_blocking_region(((VALUE (*)(void*))query_execute_statement), &query, RUBY_UBF_IO, 0);
-    query_execute_statement(&query);
+    if (rb_thread_blocking_region(((VALUE (*)(void*))query_execute_statement), &query, RUBY_UBF_IO, 0) == Qfalse)
+      rb_raise(eSwiftRuntimeError, "%s", query.error);
   }
   CATCH_DBI_EXCEPTIONS();
 

data/ext/swift.h

@@ -17,10 +17,10 @@ extern VALUE eSwiftConnectionError;
 
 #define CATCH_DBI_EXCEPTIONS() \
   catch (dbi::ConnectionError &error) { \
-    rb_raise(eSwiftConnectionError, "%s", CSTRING(rb_str_new2(error.what()))); \
+    rb_raise(eSwiftConnectionError, "%s", error.what()); \
   } \
   catch (dbi::Error &error) { \
-    rb_raise(eSwiftRuntimeError, "%s", CSTRING(rb_str_new2(error.what()))); \
+    rb_raise(eSwiftRuntimeError, "%s", error.what()); \
   }
 
 #include "adapter.h"
@@ -31,5 +31,13 @@ extern VALUE eSwiftConnectionError;
 #include "request.h"
 #include "pool.h"
 
+#undef SIZET2NUM
+#ifdef HAVE_LONG_LONG
+  #define SIZET2NUM(x) ULL2NUM(x)
+  #define DAYMICROSECS 86400000000LL
+#else
+  #define SIZET2NUM(x) ULONG2NUM(x)
+  #define DAYMICROSECS 86400000000L
 #endif
 
+#endif

data/lib/swift/adapter.rb

@@ -107,7 +107,7 @@ module Swift
           when Type::Integer    then attribute.serial ? 'serial' : 'integer'
           when Type::Float      then 'float'
           when Type::BigDecimal then 'numeric'
-          when Type::Time       then 'timestamp'
+          when Type::DateTime   then 'timestamp'
           when Type::Boolean    then 'boolean'
           when Type::IO         then 'blob'
           else 'text'

data/lib/swift/type.rb

@@ -2,11 +2,12 @@ module Swift
   module Type
     class BigDecimal < Attribute; end
     class Boolean    < Attribute; end
+    class Date       < Attribute; end
+    class DateTime   < Attribute; end
     class Float      < Attribute; end
     class Integer    < Attribute; end
     class IO         < Attribute; end
     class String     < Attribute; end
-    class Time       < Attribute; end
   end # Type
 end # Swift
 

data/swift.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swift}
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna", "Bharanee 'Barney' Rathna"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-09-02}
   s.description = %q{A rational rudimentary database abstraction.}
   s.email = ["shane.hanna@gmail.com", "deepfryed@gmail.com"]
   s.extensions = ["ext/extconf.rb"]
@@ -63,12 +63,13 @@ Gem::Specification.new do |s|
      "test/test_scheme.rb",
      "test/test_timestamps.rb",
      "test/test_transactions.rb",
+     "test/test_types.rb",
      "test/test_validations.rb"
   ]
   s.homepage = %q{http://github.com/shanna/swift}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A rational rudimentary database abstraction.}
   s.test_files = [
     "test/test_pool.rb",
@@ -82,6 +83,7 @@ Gem::Specification.new do |s|
      "test/test_encoding.rb",
      "test/test_timestamps.rb",
      "test/test_scheme.rb",
+     "test/test_types.rb",
      "examples/scheme.rb",
      "examples/async.rb",
      "examples/db.rb"
@@ -91,7 +93,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<minitest>, [">= 1.7.0"])
       s.add_development_dependency(%q<eventmachine>, [">= 0"])
     else

data/test/test_scheme.rb

@@ -4,12 +4,12 @@ describe 'scheme' do
   before do
     @user = Class.new(Swift::Scheme) do
       store     :users
-      attribute :id,         Swift::Type::Integer, serial: true, key: true
-      attribute :name,       Swift::Type::String,  default: "dave"
-      attribute :age,        Swift::Type::Integer, default: 18
+      attribute :id,         Swift::Type::Integer,  serial: true, key: true
+      attribute :name,       Swift::Type::String,   default: "dave"
+      attribute :age,        Swift::Type::Integer,  default: 18
       attribute :email,      Swift::Type::String
-      attribute :verified,   Swift::Type::Boolean, default: false
-      attribute :created_at, Swift::Type::Time,    default: proc { Time.now }
+      attribute :verified,   Swift::Type::Boolean,  default: false
+      attribute :created_at, Swift::Type::DateTime, default: proc { Time.now }
     end
   end
 

data/test/test_types.rb

@@ -0,0 +1,29 @@
+require_relative 'helper'
+
+describe 'Adapter' do
+  supported_by Swift::DB::Postgres, Swift::DB::Mysql do
+    describe 'typecasting' do
+      before do
+        @db = Swift.db
+        @db.execute %q{drop table if exists users}
+        @db.execute %q{
+          create table users(id serial, name text, age integer, height float, hacker bool, slacker bool, created date)
+        }
+      end
+
+      it 'query result is typecast correctly' do
+        bind = [ 'jim', 32, 178.71, true, false ]
+        @db.execute %q{insert into users(name,age,height,hacker,slacker, created) values(?, ?, ?, ?, ?, now())}, *bind
+
+        result = @db.prepare(%q{select * from users limit 1}).execute.first
+        assert_kind_of Integer,    result[:id]
+        assert_kind_of String,     result[:name]
+        assert_kind_of Integer,    result[:age]
+        assert_kind_of Float,      result[:height]
+        assert_kind_of TrueClass,  result[:hacker]
+        assert_kind_of FalseClass, result[:slacker]
+        assert_kind_of Date,       result[:created]
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -15,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +10:00
+date: 2010-09-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -37,7 +36,6 @@ dependencies:
   name: eventmachine
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -103,10 +101,8 @@ files:
 - test/test_scheme.rb
 - test/test_timestamps.rb
 - test/test_transactions.rb
+- test/test_types.rb
 - test/test_validations.rb
-- examples/scheme.rb
-- examples/async.rb
-- examples/db.rb
 has_rdoc: true
 homepage: http://github.com/shanna/swift
 licenses: []
@@ -117,7 +113,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -125,7 +120,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -135,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A rational rudimentary database abstraction.
@@ -151,6 +145,7 @@ test_files:
 - test/test_encoding.rb
 - test/test_timestamps.rb
 - test/test_scheme.rb
+- test/test_types.rb
 - examples/scheme.rb
 - examples/async.rb
 - examples/db.rb