do_sqlite3 0.10.0-x86-mingw32 → 0.10.1-x86-mingw32

data/ChangeLog.markdown

@@ -0,0 +1,32 @@
+## 0.10.1 (unreleased, in git)
+
+* Support for Ruby 1.8 and 1.9 on Windows.
+* Switch to Jeweler for Gem building tasks (this change may be temporary).
+* Switch to using Bacon for running specs: This should make specs friendlier to
+  new Ruby implementations that are not yet 100% MRI-compatible, and in turn,
+  prepared the road for our own IronRuby and MacRuby support.
+* Switch to the newly added rake-compiler `JavaExtensionTask` for compiling
+  JRuby extensions, instead of our (broken) home-grown solution.
+
+## 0.10.0 2009-09-15
+* Improvements
+  * JRuby Support (using *do_jdbc*)
+
+## 0.9.12 2009-05-17
+* Improvements
+  * rake-compiler for Windows support
+
+## 0.9.11 2009-01-19
+* Improvements
+  * Ruby 1.9 support
+* Fixes
+  * Fix Windows gem
+
+## 0.9.9 2008-11-27
+* Improvements
+  * Added cross compile rake tasks for Windows gems [Jonathan Stott, Luis Lavena]
+  * Added initial support for Ruby 1.9 [John Harrison]
+
+* Bug Fixes
+  * Removed sqlite3.dll from source gem [Dan Kubb]
+  * Removed hard coded .bundle from source [Dirkjan Bussink]

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, 2008, 2009 Yehuda Katz, Dirkjan Bussink
+Copyright (c) 2007 - 2010 Yehuda Katz, Dirkjan Bussink
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,4 +1,102 @@
-do_sqlite3
-==========
+# do_sqlite3
 
-A DataObjects driver for SQLite3
+* <http://dataobjects.info>
+
+## Description
+
+A SQLite3 driver for DataObjects.
+
+## Features/Problems
+
+This driver implements the DataObjects API for the SQLite3 relational database.
+
+## Synopsis
+
+An example of usage:
+
+    @connection = DataObjects::Connection.new("sqlite3://employees")
+    @reader = @connection.create_command('SELECT * FROM users').execute_reader
+    @reader.next!
+
+In the future, the `Connection` constructor will be able to be passed either a
+DataObjects-style URL or JDBC style URL, when using do\_sqlite3 on JRuby.
+However, this feature is not currently working reliably and is a known issue.
+
+## Requirements
+
+This driver is provided for the following platforms:
+ * Ruby MRI (1.8.6/7), 1.9: tested on Linux, Mac OS X and Windows platforms.
+ * JRuby 1.3.1 + (1.4+ recommended).
+ * Rubinius (experimental).
+
+Additionally you should have the following prerequisites:
+ * `data_objects` gem
+ * `do_jdbc` gem (shared library), if running on JRuby.
+
+## Install
+
+To install the gem:
+
+    gem install do_sqlite3
+
+To compile and install from source:
+
+ * Install rake-compiler: `gem install rake-compiler`.
+
+ * For MRI/Rubinius extensions:
+   * Install the `gcc` compiler. On OS X, you should install XCode tools. On
+     Ubuntu, run `apt-get install build-essential`.
+   * Install Ruby and SQLite3.
+   * Install the Ruby and SQLite3 development headers.
+     * On Debian-Linux distributions, you can install the following packages
+       with `apt`: `ruby-dev` `libsqlite3-dev`.
+   * If you want to cross-compile for Windows:
+     * Install MinGW:
+       * On Debian-Linux distributions, you can install the following package
+         with `apt`: `mingw32`.
+       * On OS X, this can install the following package with MacPorts: `i386-mingw32-gcc`.
+     * Run `rake-compiler cross-ruby`.
+     * Run `rake-compiler update-config`.
+
+ * For JRuby extensions:
+   * Install the Java Development Kit (provided if you are
+     on a recent version of Mac OS X) from <http://java.sun.com>.
+   * Install a recent version of JRuby. Ensure `jruby` is in your `PATH` and/or
+     you have configured the `JRUBY_HOME` environment variable to point to your
+     JRuby installation.
+   * Install `data_objects` and `do_jdbc` with `jruby -S rake install`.
+
+ * Then, install this driver with `(jruby -S) rake install`.
+
+For more information, see the SQLite3 driver wiki page:
+<http://wiki.github.com/datamapper/do/sqlite3>.
+
+## Developers
+
+Follow the above installation instructions. Additionally, you'll need:
+  * `bacon` gem for running specs.
+  * `YARD` gem for generating documentation.
+
+See the DataObjects wiki for more comprehensive information on installing and
+contributing to the JRuby-variant of this driver:
+<http://wiki.github.com/datamapper/do/jruby>.
+
+To run specs:
+
+    rake spec
+
+To run specs without compiling extensions first:
+
+    rake spec_no_compile
+
+To run individual specs:
+
+    rake spec TEST=spec/connection_spec.rb
+
+(Note that the `rake` task uses a `TEST` parameter, not `SPEC`. This is because
+the `Rake::TestTask` is used for executing the Bacon specs).
+
+## License
+
+This code is licensed under an **MIT (X11) License**. Please see the
+accompanying `LICENSE` file.

data/Rakefile

@@ -1,16 +1,63 @@
+require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/clean'
 
-require 'pathname'
-require 'lib/do_sqlite3/version'
+ROOT = Pathname(__FILE__).dirname.expand_path
+
+require ROOT + 'lib/do_sqlite3/version'
+
+JRUBY    = RUBY_PLATFORM =~ /java/
+IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
+WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
+SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
+BINARY_VERSION = '3_6_21'
+
+CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_sqlite3/Makefile ext-java/target ])
+
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'do_sqlite3'
+    gem.version     = DataObjects::Sqlite3::VERSION
+    gem.summary     = 'DataObjects Sqlite3 Driver'
+    gem.description = 'Implements the DataObjects API for Sqlite3'
+    gem.platform    = Gem::Platform::RUBY
+    gem.files       = FileList['lib/**/*.rb', 'spec/**/*.rb', 'tasks/**/*.rake',
+                               'ext/**/*.{rb,c,h}', 'LICENSE', 'Rakefile',
+                               '*.{markdown,rdoc,txt,yml}']
+    gem.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE']
+    gem.test_files  = FileList['spec/**/*.rb']
+
+    # rake-compiler should generate gemspecs for other platforms (e.g. 'java')
+    # and modify dependencies and extensions appropriately
+    gem.extensions << 'ext/do_sqlite3/extconf.rb'
+
+    gem.add_dependency 'data_objects', DataObjects::Sqlite3::VERSION
+
+    gem.add_development_dependency 'bacon',         '~>1.1'
+    gem.add_development_dependency 'rake-compiler', '~>0.7'
+
+    gem.has_rdoc = false
+    gem.rubyforge_project = 'dorb'
+    gem.authors     = [ 'Dirkjan Bussink' ]
+    gem.email       = 'd.bussink@gmail.com'
+  end
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '3_6_13'
+  if JRUBY
+    Rake::Task['build'].clear_actions   if Rake::Task.task_defined?('build')
+    Rake::Task['install'].clear_actions if Rake::Task.task_defined?('install')
+    task :build => [ :java, :gem ]
+    task :install do
+      sh "#{Config::CONFIG['RUBY_INSTALL_NAME']} -S gem install pkg/do_sqlite3-#{DataObjects::Sqlite3::VERSION}-java.gem"
+    end
+  end
 
-Dir['tasks/*.rake'].sort.each { |f| import f }
+  Jeweler::GemcutterTasks.new
 
-CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_sqlite3_ext/Makefile ext-java/target ])
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+end

data/ext/do_sqlite3/compat.h

@@ -0,0 +1,55 @@
+#ifndef RUBY_COMPAT_H
+#define RUBY_COMPAT_H
+
+/*
+ * Rules for better ruby C extensions:
+ *
+ * Never use the R<TYPE> macros directly, always use R<TYPE>_<FIELD>
+ *
+ * Never compare with RBASIC(obj)->klass, always use
+ *   rb_obj_is_instance_of()
+ *
+ * Never use RHASH(obj)->tbl or RHASH_TBL().
+ *
+ */
+
+
+// Array
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(obj) RARRAY(obj)->ptr
+#endif
+
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(obj) RARRAY(obj)->len
+#endif
+
+// String
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(obj) RSTRING(obj)->ptr
+#endif
+
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(obj) RSTRING(obj)->len
+#endif
+
+#ifndef rb_str_ptr
+#define rb_str_ptr(str) RSTRING_PTR(str)
+#endif
+
+#ifndef rb_str_ptr_readonly
+#define rb_str_ptr_readonly(str) RSTRING_PTR(str)
+#endif
+
+#ifndef rb_str_flush
+#define rb_str_flush(str)
+#endif
+
+#ifndef rb_str_update
+#define rb_str_update(str)
+#endif
+
+#ifndef rb_str_len
+#define rb_str_len(str) RSTRING_LEN(str)
+#endif
+
+#endif

data/ext/{do_sqlite3_ext/do_sqlite3_ext.c → do_sqlite3/do_sqlite3.c}

@@ -4,6 +4,7 @@
 #include <time.h>
 #include <locale.h>
 #include <sqlite3.h>
+#include "compat.h"
 #include "error.h"
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -47,20 +48,6 @@
 #define CONST_GET(scope, constant) (rb_funcall(scope, ID_CONST_GET, 1, rb_str_new2(constant)))
 #define SQLITE3_CLASS(klass, parent) (rb_define_class_under(mSqlite3, klass, parent))
 
-#define TRUE_CLASS CONST_GET(rb_mKernel, "TrueClass")
-
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-#ifndef RARRAY_LEN
-#define RARRAY_LEN(a) RARRAY(a)->len
-#endif
-
 #ifdef _WIN32
 #define do_int64 signed __int64
 #else
@@ -130,15 +117,15 @@ static int jd_from_date(int year, int month, int day) {
   }
   a = year / 100;
   b = 2 - a + (a / 4);
-  return floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524;
+  return (int) (floor(365.25 * (year + 4716)) + floor(30.6001 * (month + 1)) + day + b - 1524);
 }
 
 static void data_objects_debug(VALUE string, struct timeval* start) {
   struct timeval stop;
   char *message;
 
-  char *query = RSTRING_PTR(string);
-  int length  = RSTRING_LEN(string);
+  const char *query = rb_str_ptr_readonly(string);
+  size_t length     = rb_str_len(string);
   char total_time[32];
   do_int64 duration = 0;
 
@@ -274,8 +261,8 @@ static VALUE parse_date_time(char *date) {
     if ( is_dst > 0 )
       gmt_offset -= is_dst;
 
-    hour_offset = -(gmt_offset / 3600);
-    minute_offset = -(gmt_offset % 3600 / 60);
+    hour_offset = -((int)gmt_offset / 3600);
+    minute_offset = -((int)gmt_offset % 3600 / 60);
 
   } else {
     // Something went terribly wrong
@@ -383,7 +370,7 @@ static VALUE typecast(sqlite3_stmt *stmt, int i, VALUE type, int encoding) {
   } else if (type == rb_cByteArray) {
     return rb_funcall(rb_cByteArray, ID_NEW, 1, rb_str_new((char*)sqlite3_column_blob(stmt, i), length));
   } else if (type == rb_cClass) {
-    return rb_funcall(rb_cObject, rb_intern("full_const_get"), 1, rb_str_new((char*)sqlite3_column_text(stmt, i), length));
+    return rb_funcall(mDO, rb_intern("full_const_get"), 1, rb_str_new((char*)sqlite3_column_text(stmt, i), length));
   } else if (type == rb_cObject) {
     return rb_marshal_load(rb_str_new((char*)sqlite3_column_text(stmt, i), length));
   } else if (type == rb_cNilClass) {
@@ -441,9 +428,9 @@ static VALUE cConnection_initialize(VALUE self, VALUE uri) {
   path = rb_funcall(uri, ID_PATH, 0);
 
 #ifdef HAVE_SQLITE3_OPEN_V2
-  ret = sqlite3_open_v2(StringValuePtr(path), &db, flags_from_uri(uri), 0);
+  ret = sqlite3_open_v2(rb_str_ptr_readonly(path), &db, flags_from_uri(uri), 0);
 #else
-  ret = sqlite3_open(StringValuePtr(path), &db);
+  ret = sqlite3_open(rb_str_ptr_readonly(path), &db);
 #endif
 
   if ( ret != SQLITE_OK ) {
@@ -519,7 +506,7 @@ static VALUE cConnection_quote_boolean(VALUE self, VALUE value) {
 }
 
 static VALUE cConnection_quote_string(VALUE self, VALUE string) {
-  const char *source = StringValuePtr(string);
+  const char *source = rb_str_ptr_readonly(string);
   char *escaped_with_quotes;
   VALUE result;
 
@@ -534,6 +521,18 @@ static VALUE cConnection_quote_string(VALUE self, VALUE string) {
   return result;
 }
 
+static VALUE cConnection_quote_byte_array(VALUE self, VALUE string) {
+  VALUE source = StringValue(string);
+  VALUE array = rb_funcall(source, rb_intern("unpack"), 1, rb_str_new2("H*"));
+  rb_ary_unshift(array, rb_str_new2("X'"));
+  rb_ary_push(array, rb_str_new2("'"));
+  return rb_ary_join(array, Qnil);
+}
+
+static VALUE cConnection_character_set(VALUE self) {
+  return rb_iv_get(self, "@encoding");
+}
+
 static VALUE build_query_from_args(VALUE klass, int count, VALUE *args) {
   VALUE query = rb_iv_get(klass, "@text");
   int i;
@@ -550,18 +549,23 @@ static VALUE cCommand_execute_non_query(int argc, VALUE *argv, VALUE self) {
   char *error_message;
   int status;
   int affected_rows;
-  int insert_id;
-  VALUE conn_obj;
+  do_int64 insert_id;
+  VALUE connection, sqlite3_connection;
   VALUE query;
   struct timeval start;
 
   query = build_query_from_args(self, argc, argv);
 
-  conn_obj = rb_iv_get(self, "@connection");
-  Data_Get_Struct(rb_iv_get(conn_obj, "@connection"), sqlite3, db);
+  connection = rb_iv_get(self, "@connection");
+  sqlite3_connection = rb_iv_get(connection, "@connection");
+  if (Qnil == sqlite3_connection) {
+    rb_raise(eConnectionError, "This connection has already been closed.");
+  }
+
+  Data_Get_Struct(sqlite3_connection, sqlite3, db);
 
   gettimeofday(&start, NULL);
-  status = sqlite3_exec(db, StringValuePtr(query), 0, 0, &error_message);
+  status = sqlite3_exec(db, rb_str_ptr_readonly(query), 0, 0, &error_message);
 
   if ( status != SQLITE_OK ) {
     raise_error(self, db, query);
@@ -581,18 +585,23 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
   int field_count;
   int i;
   VALUE reader;
-  VALUE conn_obj;
+  VALUE connection, sqlite3_connection;
   VALUE query;
   VALUE field_names, field_types;
   struct timeval start;
 
-  conn_obj = rb_iv_get(self, "@connection");
-  Data_Get_Struct(rb_iv_get(conn_obj, "@connection"), sqlite3, db);
+  connection = rb_iv_get(self, "@connection");
+  sqlite3_connection = rb_iv_get(connection, "@connection");
+  if (Qnil == sqlite3_connection) {
+    rb_raise(eConnectionError, "This connection has already been closed.");
+  }
+
+  Data_Get_Struct(sqlite3_connection, sqlite3, db);
 
   query = build_query_from_args(self, argc, argv);
 
   gettimeofday(&start, NULL);
-  status = sqlite3_prepare_v2(db, StringValuePtr(query), -1, &sqlite3_reader, 0);
+  status = sqlite3_prepare_v2(db, rb_str_ptr_readonly(query), -1, &sqlite3_reader, 0);
   data_objects_debug(query, &start);
 
   if ( status != SQLITE_OK ) {
@@ -604,6 +613,7 @@ static VALUE cCommand_execute_reader(int argc, VALUE *argv, VALUE self) {
 
   rb_iv_set(reader, "@reader", Data_Wrap_Struct(rb_cObject, 0, 0, sqlite3_reader));
   rb_iv_set(reader, "@field_count", INT2NUM(field_count));
+  rb_iv_set(reader, "@connection", connection);
 
   field_names = rb_ary_new();
   field_types = rb_iv_get(self, "@field_types");
@@ -647,7 +657,7 @@ static VALUE cReader_next(VALUE self) {
   int field_count;
   int result;
   int i;
-  int ft_length;
+  size_t ft_length;
   VALUE arr = rb_ary_new();
   VALUE field_types;
   VALUE field_type;
@@ -707,7 +717,7 @@ static VALUE cReader_field_count(VALUE self) {
   return rb_iv_get(self, "@field_count");
 }
 
-void Init_do_sqlite3_ext() {
+void Init_do_sqlite3() {
   rb_require("bigdecimal");
   rb_require("date");
 
@@ -752,6 +762,8 @@ void Init_do_sqlite3_ext() {
   rb_define_method(cConnection, "dispose", cConnection_dispose, 0);
   rb_define_method(cConnection, "quote_boolean", cConnection_quote_boolean, 1);
   rb_define_method(cConnection, "quote_string", cConnection_quote_string, 1);
+  rb_define_method(cConnection, "quote_byte_array", cConnection_quote_byte_array, 1);
+  rb_define_method(cConnection, "character_set", cConnection_character_set, 0);
 
   cCommand = SQLITE3_CLASS("Command", cDO_Command);
   rb_define_method(cCommand, "set_types", cCommand_set_types, -1);