fb 0.6.7 → 0.7.0

data/extconf.rb

@@ -14,13 +14,29 @@
 # = Mac OS X (Intel)
 # * Works
 
-if RUBY_PLATFORM =~ /(mingw32|mswin32)/ and ARGV.grep(/^--with-opt-dir=/).empty?
-  program_files = ENV['ProgramFiles'].gsub('\\', '/').gsub(/(\w+\s+[\w\s]+)/) { |s| s.size > 8 ? s[0,6] + '~1' : s }
-  if opt = Dir["#{program_files}/Firebird/Firebird_*"].sort.last
-    ARGV << "--with-opt-dir=#{opt}"
+def unquote(string)
+  string.sub(/\A(['"])?(.*?)\1?\z/m, '\2') unless string.nil?
+end
+
+def read_firebird_registry
+  require 'win32/registry'
+  Win32::Registry::HKEY_LOCAL_MACHINE.open('SOFTWARE\Firebird Project\Firebird Server\Instances', Win32::Registry::Constants::KEY_READ) do |reg|
+    return reg.read_s('DefaultInstance') rescue nil
   end
 end
 
+def search_firebird_path
+  program_files = ENV['ProgramFiles'].gsub('\\', '/').gsub(/(\w+\s+[\w\s]+)/) { |s| s.size > 8 ? s[0,6] + '~1' : s }
+  Dir["#{program_files}/Firebird/Firebird_*"].sort.last
+end
+
+if RUBY_PLATFORM =~ /(mingw32|mswin32)/ and ARGV.grep(/^--with-opt-dir=/).empty?
+  opt = unquote(ENV['FIREBIRD'])    
+  opt = opt || read_firebird_registry
+  opt = opt || search_firebird_path
+  ARGV << "--with-opt-dir=#{opt}" if opt
+end
+
 require 'mkmf'
 
 libs = %w/ fbclient gds /

data/fb.c

@@ -21,7 +21,47 @@
   */
 
 #include "ruby.h"
-#include "re.h"
+
+/* Ensure compatibility with early releases of Ruby 1.8.5 */
+#ifndef RSTRING_PTR
+#  define RSTRING_PTR(v) RSTRING(v)->ptr
+#endif
+
+#ifndef RSTRING_LEN
+#  define RSTRING_LEN(v) RSTRING(v)->len
+#endif
+
+#ifndef RARRAY_PTR
+#  define RARRAY_PTR(v) RARRAY(v)->ptr
+#endif
+
+#ifndef RARRAY_LEN
+#  define RARRAY_LEN(v) RARRAY(v)->len
+#endif
+
+#ifdef HAVE_RUBY_REGEX_H
+#  include "ruby/re.h"
+#else
+#  include "re.h"
+#endif
+
+// this sucks. but for some reason these moved around between 1.8 and 1.9
+#ifdef ONIGURUMA_H
+#define IGNORECASE ONIG_OPTION_IGNORECASE
+#define MULTILINE ONIG_OPTION_MULTILINE
+#define EXTENDED ONIG_OPTION_EXTEND
+#else
+#define IGNORECASE RE_OPTION_IGNORECASE
+#define MULTILINE RE_OPTION_MULTILINE
+#define EXTENDED RE_OPTION_EXTENDED
+#endif
+
+// this sucks too.
+#ifndef RREGEXP_SRC_PTR
+#define RREGEXP_SRC_PTR(r) RREGEXP(r)->str
+#define RREGEXP_SRC_LEN(r) RREGEXP(r)->len
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <limits.h>
@@ -29,6 +69,7 @@
 #include <float.h>
 #include <time.h>
 
+
 #define	SQLDA_COLSINIT	50
 #define	SQLCODE_NOMORE	100
 #define	TPBBUFF_ALLOC	64
@@ -61,6 +102,7 @@ static ID id_downcase_bang;
 static VALUE re_lowercase;
 static ID id_rstrip_bang;
 static ID id_sub_bang;
+static ID id_force_encoding;
 
 /* static char isc_info_stmt[] = { isc_info_sql_stmt_type }; */
 /* static char isc_info_buff[16]; */
@@ -93,6 +135,7 @@ struct FbConnection {
 	unsigned short dialect;
 	unsigned short db_dialect;
 	short downcase_names;
+	VALUE encoding;
 	int dropped;
 	ISC_STATUS isc_status[20];
 	/* struct FbConnection *next; */
@@ -118,8 +161,8 @@ struct FbCursor {
 
 typedef struct trans_opts
 {
-	char *option1;
-	char *option2;
+	const char *option1;
+	const char *option2;
 	char  optval;
 	short position;
 	struct trans_opts *sub_opts;
@@ -208,7 +251,7 @@ struct time_object {
 #define GetTimeval(obj, tobj) \
     Data_Get_Struct(obj, struct time_object, tobj)
 
-static VALUE fb_mktime(struct tm *tm, char *which)
+static VALUE fb_mktime(struct tm *tm, const char *which)
 {
 #if defined(_WIN32)
 	if (tm->tm_year + 1900 < 1970)
@@ -272,16 +315,42 @@ static void tm_from_date(struct tm *tm, VALUE date)
 
 static void tm_from_timestamp(struct tm *tm, VALUE obj)
 {
+#ifdef TypedData_Get_Struct
+	VALUE year, month, day, hour, min, sec;
+#endif
 	struct time_object *tobj;
 
-	if (!rb_obj_is_kind_of(obj, rb_cTime) && rb_respond_to(obj, rb_intern("to_str")))
+	if (!rb_obj_is_kind_of(obj, rb_cTime))
 	{
-		VALUE s = rb_funcall(obj, rb_intern("to_str"), 0);
-		obj = rb_funcall(rb_cTime, rb_intern("parse"), 1, s);
+		if (rb_respond_to(obj, rb_intern("to_str")))
+		{
+			VALUE s = rb_funcall(obj, rb_intern("to_str"), 0);
+			obj = rb_funcall(rb_cTime, rb_intern("parse"), 1, s);
+		}
+		else
+		{
+			rb_raise(rb_eTypeError, "Expecting Time object or string.");
+		}
 	}
 
+#ifdef TypedData_Get_Struct
+	year = rb_funcall(obj, rb_intern("year"), 0);
+	month = rb_funcall(obj, rb_intern("month"), 0);
+	day = rb_funcall(obj, rb_intern("day"), 0);
+	hour = rb_funcall(obj, rb_intern("hour"), 0);
+	min = rb_funcall(obj, rb_intern("min"), 0);
+	sec = rb_funcall(obj, rb_intern("sec"), 0);
+	memset(tm, 0, sizeof(struct tm));
+	tm->tm_year = FIX2INT(year) - 1900;
+	tm->tm_mon = FIX2INT(month) - 1;
+	tm->tm_mday = FIX2INT(day);
+	tm->tm_hour = FIX2INT(hour);
+	tm->tm_min = FIX2INT(min);
+	tm->tm_sec = FIX2INT(sec);
+#else
 	GetTimeval(obj, tobj);
 	*tm = tobj->tm;
+#endif
 }
 
 static VALUE long_from_obj(VALUE obj)
@@ -315,7 +384,7 @@ static VALUE double_from_obj(VALUE obj)
 
 static VALUE fb_sql_type_from_code(int code, int subtype)
 {
-	char *sql_type = NULL;
+	const char *sql_type = NULL;
 	switch(code) {
 		case SQL_TEXT:
 		case blr_text:
@@ -408,7 +477,6 @@ static VALUE sql_type_from_code(VALUE self, VALUE code, VALUE subtype)
 
 static void fb_error_check(ISC_STATUS *isc_status)
 {
-	HERE("fb_error_check");
 	if (isc_status[0] == 1 && isc_status[1]) {
 		char buf[1024];
 		VALUE exc, msg, msg1, msg2;
@@ -422,10 +490,8 @@ static void fb_error_check(ISC_STATUS *isc_status)
 
 		exc = rb_exc_new3(rb_eFbError, msg);
 		rb_iv_set(exc, "error_code", INT2FIX(code));
-		HERE("fb_error_check 1");
 		rb_exc_raise(exc);
 	}
-	HERE("fb_error_check 2");
 }
 
 static void fb_error_check_warn(ISC_STATUS *isc_status)
@@ -464,7 +530,6 @@ static void fb_cursor_free();
 /* connection utilities */
 static void fb_connection_check(struct FbConnection *fb_connection)
 {
-	HERE("fb_connection_check");
 	if (fb_connection->db == 0) {
 		rb_raise(rb_eFbError, "closed db connection");
 	}
@@ -488,20 +553,20 @@ static void global_close_cursors()
 static void fb_connection_close_cursors(struct FbConnection *fb_connection)
 {
 	int i;
-
-	for (i = 0; i < RARRAY(fb_connection->cursor)->len; i++) {
-		cursor_close(RARRAY(fb_connection->cursor)->ptr[i]);
+	long len = RARRAY_LEN(fb_connection->cursor);
+	for (i = 0; i < len; i++) {
+		cursor_close(RARRAY_PTR(fb_connection->cursor)[i]);
 	}
 }
 
 static void fb_connection_drop_cursors(struct FbConnection *fb_connection)
 {
 	int i;
-
-	for (i = 0; i < RARRAY(fb_connection->cursor)->len; i++) {
-		cursor_drop(RARRAY(fb_connection->cursor)->ptr[i]);
+	long len = RARRAY_LEN(fb_connection->cursor);
+	for (i = 0; i < len; i++) {
+		cursor_drop(RARRAY_PTR(fb_connection->cursor)[i]);
 	}
-	RARRAY(fb_connection->cursor)->len = 0;
+  rb_ary_clear(fb_connection->cursor);
 }
 
 /*
@@ -667,7 +732,7 @@ static trans_opts	trans_opt_S[] =
 #define	RESV_WRITE	"WRITE"
 #define	RESV_CONTINUE	','
 
-static char* trans_parseopts(VALUE opt, int *tpb_len)
+static char* trans_parseopts(VALUE opt, long *tpb_len)
 {
 	char *s, *trans;
 	long used;
@@ -683,17 +748,17 @@ static char* trans_parseopts(VALUE opt, int *tpb_len)
 	char *resv_p;
 	char *resend_p;
 	char *tblend_p = 0;
-	int tbl_len;
-	int res_first;
+	long tbl_len;
+	long res_first;
 	int res_count;
-	int ofs;
+	long ofs;
 	char sp_prm;
 	char rw_prm;
 	int cont_f;
-	char *desc = 0;
+	const char *desc = 0;
 
 	/* Initialize */
-	s = STR2CSTR(opt);
+	s = StringValuePtr(opt);
 	trans = ALLOCA_N(char, strlen(s)+1);
 	strcpy(trans, s);
 	s = trans;
@@ -917,7 +982,7 @@ static char* trans_parseopts(VALUE opt, int *tpb_len)
 
 error:
 	xfree(tpb);
-	rb_raise(rb_eFbError, desc);
+	rb_raise(rb_eFbError, "%s", desc);
 }
 
 /*
@@ -1062,9 +1127,8 @@ static VALUE global_transaction_started()
 static void fb_connection_transaction_start(struct FbConnection *fb_connection, VALUE opt)
 {
 	char *tpb = 0;
-	int tpb_len;
+	long tpb_len;
 
-	HERE("fb_connection_transaction_start");
 	if (fb_connection->transact) {
 		rb_raise(rb_eFbError, "A transaction has been already started");
 	}
@@ -1079,31 +1143,24 @@ static void fb_connection_transaction_start(struct FbConnection *fb_connection,
 	isc_start_transaction(fb_connection->isc_status, &fb_connection->transact, 1, &fb_connection->db, tpb_len, tpb);
 	xfree(tpb);
 	fb_error_check(fb_connection->isc_status);
-	HERE("fb_connection_transaction_start Z");
 }
 
 static void fb_connection_commit(struct FbConnection *fb_connection)
 {
-	HERE("fb_connection_commit");
-
 	if (fb_connection->transact) {
 		fb_connection_close_cursors(fb_connection);
 		isc_commit_transaction(fb_connection->isc_status, &fb_connection->transact);
 		fb_error_check(fb_connection->isc_status);
 	}
-	HERE("fb_connection_commit Z");
 }
 
 static void fb_connection_rollback(struct FbConnection *fb_connection)
 {
-	HERE("fb_connection_rollback");
-
 	if (fb_connection->transact) {
 		fb_connection_close_cursors(fb_connection);
 		isc_rollback_transaction(fb_connection->isc_status, &fb_connection->transact);
 		fb_error_check(fb_connection->isc_status);
 	}
-	HERE("fb_connection_rollback Z");
 }
 
 /* call-seq:
@@ -1219,7 +1276,6 @@ static VALUE connection_cursor(VALUE self)
 	struct FbConnection *fb_connection;
 	struct FbCursor *fb_cursor;
 
-	HERE("connection_cursor");
 	Data_Get_Struct(self, struct FbConnection, fb_connection);
 	fb_connection_check(fb_connection);
 
@@ -1238,7 +1294,6 @@ static VALUE connection_cursor(VALUE self)
 	fb_cursor->o_buffer_size = 0;
 	isc_dsql_alloc_statement2(fb_connection->isc_status, &fb_connection->db, &fb_cursor->stmt);
 	fb_error_check(fb_connection->isc_status);
-	HERE("connection_cursor Z");
 
 	return c;
 }
@@ -1269,7 +1324,6 @@ static VALUE connection_cursor(VALUE self)
  */
 static VALUE connection_execute(int argc, VALUE *argv, VALUE self)
 {
-	HERE("connection_execute");
 	VALUE cursor = connection_cursor(self);
 	VALUE val = cursor_execute(argc, argv, cursor);
 
@@ -1283,7 +1337,6 @@ static VALUE connection_execute(int argc, VALUE *argv, VALUE self)
 	} else {
 		cursor_drop(cursor);
 	}
-	HERE("connection_execute Z");
 	return val;
 }
 
@@ -1308,7 +1361,6 @@ static VALUE connection_query(int argc, VALUE *argv, VALUE self)
 	VALUE cursor;
 	VALUE result;
 
-	HERE("connection_query");
 	if (argc >= 1 && TYPE(argv[0]) == T_SYMBOL) {
 		format = argv[0];
 		argc--; argv++;
@@ -1321,7 +1373,6 @@ static VALUE connection_query(int argc, VALUE *argv, VALUE self)
 		result = cursor_fetchall(1, &format, cursor);
 		cursor_close(cursor);
 	}
-	HERE("connection_query Z");
 
 	return result;
 }
@@ -1444,7 +1495,7 @@ static void fb_cursor_free(struct FbCursor *fb_cursor)
 	xfree(fb_cursor);
 }
 
-static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALUE *argv)
+static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, long argc, VALUE *argv)
 {
 	struct FbConnection *fb_connection;
 	long count;
@@ -1475,7 +1526,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 
 	/* Check the number of parameters */
 	if (fb_cursor->i_sqlda->sqld != argc) {
-		rb_raise(rb_eFbError, "statement requires %d items; %d given", fb_cursor->i_sqlda->sqld, argc);
+		rb_raise(rb_eFbError, "statement requires %d items; %ld given", fb_cursor->i_sqlda->sqld, argc);
 	}
 
 	/* Get the parameters */
@@ -1496,12 +1547,12 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 					offset = FB_ALIGN(offset, alignment);
 					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
 					obj = rb_obj_as_string(obj);
-					if (RSTRING(obj)->len > var->sqllen) {
-						rb_raise(rb_eRangeError, "CHAR overflow: %d bytes exceeds %d byte(s) allowed.",
-							RSTRING(obj)->len, var->sqllen);
+					if (RSTRING_LEN(obj) > var->sqllen) {
+						rb_raise(rb_eRangeError, "CHAR overflow: %ld bytes exceeds %d byte(s) allowed.",
+							RSTRING_LEN(obj), var->sqllen);
 					}
-					memcpy(var->sqldata, RSTRING(obj)->ptr, RSTRING(obj)->len);
-					var->sqllen = RSTRING(obj)->len;
+					memcpy(var->sqldata, RSTRING_PTR(obj), RSTRING_LEN(obj));
+					var->sqllen = RSTRING_LEN(obj);
 					offset += var->sqllen + 1;
 					break;
 
@@ -1511,12 +1562,12 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
 					vary = (VARY *)var->sqldata;
 					obj = rb_obj_as_string(obj);
-					if (RSTRING(obj)->len > var->sqllen) {
-						rb_raise(rb_eRangeError, "VARCHAR overflow: %d bytes exceeds %d byte(s) allowed.",
-							RSTRING(obj)->len, var->sqllen);
+					if (RSTRING_LEN(obj) > var->sqllen) {
+						rb_raise(rb_eRangeError, "VARCHAR overflow: %ld bytes exceeds %d byte(s) allowed.",
+							RSTRING_LEN(obj), var->sqllen);
 					}
-					memcpy(vary->vary_string, RSTRING(obj)->ptr, RSTRING(obj)->len);
-					vary->vary_length = RSTRING(obj)->len;
+					memcpy(vary->vary_string, RSTRING_PTR(obj), RSTRING_LEN(obj));
+					vary->vary_length = RSTRING_LEN(obj);
 					offset += vary->vary_length + sizeof(short);
 					break;
 
@@ -1558,7 +1609,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 					if (lvalue < -2147483647 || lvalue > 2147483647) {
                         rb_raise(rb_eRangeError, "integer overflow");
 					}
-					*(ISC_LONG *)var->sqldata = lvalue;
+					*(ISC_LONG *)var->sqldata = (ISC_LONG)lvalue;
 					offset += alignment;
 					break;
 
@@ -1575,7 +1626,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 					if (dcheck != 0.0 && (dcheck < FLT_MIN || dcheck > FLT_MAX)) {
 						rb_raise(rb_eRangeError, "float overflow");
 					}
-					*(float *)var->sqldata = dvalue;
+					*(float *)var->sqldata = (float)dvalue;
 					offset += alignment;
 					break;
 
@@ -1618,8 +1669,8 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 						fb_connection->isc_status,&fb_connection->db,&fb_connection->transact,
 						&blob_handle,&blob_id,0,NULL);
 					fb_error_check(fb_connection->isc_status);
-					length = RSTRING(obj)->len;
-					p = RSTRING(obj)->ptr;
+					length = RSTRING_LEN(obj);
+					p = RSTRING_PTR(obj);
 					while (length >= 4096) {
 						isc_put_segment(fb_connection->isc_status,&blob_handle,4096,p);
 						fb_error_check(fb_connection->isc_status);
@@ -1697,7 +1748,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 	}
 }
 
-static void fb_cursor_execute_withparams(struct FbCursor *fb_cursor, int argc, VALUE *argv)
+static void fb_cursor_execute_withparams(struct FbCursor *fb_cursor, long argc, VALUE *argv)
 {
 	struct FbConnection *fb_connection;
 
@@ -1707,8 +1758,8 @@ static void fb_cursor_execute_withparams(struct FbCursor *fb_cursor, int argc, V
 		int i;
 		VALUE obj;
 		VALUE ary = argv[0];
-		if (RARRAY(ary)->len > 0 && TYPE(RARRAY(ary)->ptr[0]) == T_ARRAY) {
-			for (i = 0; i < RARRAY(ary)->len; i++) {
+		if (RARRAY_LEN(ary) > 0 && TYPE(RARRAY_PTR(ary)[0]) == T_ARRAY) {
+			for (i = 0; i < RARRAY_LEN(ary); i++) {
 				obj = rb_ary_entry(ary, i);
 				fb_cursor_execute_withparams(fb_cursor, 1, &obj);
 			}
@@ -1718,7 +1769,7 @@ static void fb_cursor_execute_withparams(struct FbCursor *fb_cursor, int argc, V
 
 				/* Set the input parameters */
 				Check_Type(obj, T_ARRAY);
-				fb_cursor_set_inputparams(fb_cursor, RARRAY(obj)->len, RARRAY(obj)->ptr);
+				fb_cursor_set_inputparams(fb_cursor, RARRAY_LEN(obj), RARRAY_PTR(obj));
 
 				/* Execute SQL statement */
 				isc_dsql_execute2(fb_connection->isc_status, &fb_connection->transact, &fb_cursor->stmt, SQLDA_VERSION1, fb_cursor->i_sqlda, NULL);
@@ -1782,16 +1833,13 @@ static VALUE precision_from_sqlvar(XSQLVAR *sqlvar)
 
 static int no_lowercase(VALUE value)
 {
-	HERE("no_lowercase");
-	value = StringValue(value);
-	int result = rb_funcall(re_lowercase, id_matches, 1, value) == Qnil;
-	HERE("no_lowercase Z");
+	VALUE local_value = StringValue(value);
+	int result = rb_funcall(re_lowercase, id_matches, 1, local_value) == Qnil;
 	return result;
 }
 
 static VALUE fb_cursor_fields_ary(XSQLDA *sqlda, short downcase_names)
 {
-	HERE("fb_cursor_fields_ary");
 	long cols;
 	long count;
 	XSQLVAR *var;
@@ -1837,23 +1885,20 @@ static VALUE fb_cursor_fields_ary(XSQLDA *sqlda, short downcase_names)
 		rb_ary_push(ary, field);
 	}
 	rb_ary_freeze(ary);
-	HERE("fb_cursor_fields_ary Z");
 	return ary;
 }
 
 static VALUE fb_cursor_fields_hash(VALUE fields_ary)
 {
-	HERE("fb_cursor_fields_hash");
 	int i;
 	VALUE hash = rb_hash_new();
 
-	for (i = 0; i < RARRAY(fields_ary)->len; i++) {
+	for (i = 0; i < RARRAY_LEN(fields_ary); i++) {
 		VALUE field = rb_ary_entry(fields_ary, i);
 		VALUE name = rb_struct_aref(field, LONG2NUM(0));
 		rb_hash_aset(hash, name, field);
 	}
 
-	HERE("fb_cursor_fields_hash Z");
 	return hash;
 }
 
@@ -1964,11 +2009,17 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 			switch (dtp) {
 				case SQL_TEXT:
 					val = rb_tainted_str_new(var->sqldata, var->sqllen);
+					#if HAVE_RUBY_ENCODING_H
+					rb_funcall(val, id_force_encoding, 1, fb_connection->encoding);
+					#endif
 					break;
 
 				case SQL_VARYING:
 					vary = (VARY*)var->sqldata;
 					val = rb_tainted_str_new(vary->vary_string, vary->vary_length);
+					#if HAVE_RUBY_ENCODING_H
+					rb_funcall(val, id_force_encoding, 1, fb_connection->encoding);
+					#endif
 					break;
 
 				case SQL_SHORT:
@@ -2057,10 +2108,13 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 						}
 					}
 					val = rb_tainted_str_new(NULL,total_length);
-					for (p = RSTRING(val)->ptr; num_segments > 0; num_segments--, p += actual_seg_len) {
+					for (p = RSTRING_PTR(val); num_segments > 0; num_segments--, p += actual_seg_len) {
 						isc_get_segment(fb_connection->isc_status, &blob_handle, &actual_seg_len, max_segment, p);
 						fb_error_check(fb_connection->isc_status);
 					}
+					#if HAVE_RUBY_ENCODING_H
+					rb_funcall(val, id_force_encoding, 1, fb_connection->encoding);
+					#endif
 					isc_close_blob(fb_connection->isc_status, &blob_handle);
 					fb_error_check(fb_connection->isc_status);
 					break;
@@ -2071,7 +2125,7 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 					break;
 
 				default:
-					rb_raise(rb_eFbError, "Specified table includes unsupported datatype (%d)", dtp);
+					rb_raise(rb_eFbError, "Specified table includes unsupported datatype (%ld)", dtp);
 					break;
 			}
 		}
@@ -2129,10 +2183,10 @@ static long cursor_rows_affected(struct FbCursor *fb_cursor, long statement_type
  */
 static VALUE cursor_execute2(VALUE args)
 {
-	HERE("cursor_execute2");
 	struct FbCursor *fb_cursor;
 	struct FbConnection *fb_connection;
 	char *sql;
+	VALUE rb_sql;
 	long statement;
 	long length;
 	long in_params;
@@ -2146,7 +2200,8 @@ static VALUE cursor_execute2(VALUE args)
 	Data_Get_Struct(self, struct FbCursor, fb_cursor);
 	Data_Get_Struct(fb_cursor->connection, struct FbConnection, fb_connection);
 
-	sql = STR2CSTR(rb_ary_shift(args));
+	rb_sql = rb_ary_shift(args);
+	sql = StringValuePtr(rb_sql);
 
 	/* Prepare query */
 	isc_dsql_prepare(fb_connection->isc_status, &fb_connection->transact, &fb_cursor->stmt, 0, sql, fb_connection_dialect(fb_connection), fb_cursor->o_sqlda);
@@ -2199,7 +2254,7 @@ static VALUE cursor_execute2(VALUE args)
 		} else if (statement == isc_info_sql_stmt_rollback) {
 			rb_raise(rb_eFbError, "use Fb::Connection#rollback()");
 		} else if (in_params) {
-			fb_cursor_execute_withparams(fb_cursor, RARRAY(args)->len, RARRAY(args)->ptr);
+			fb_cursor_execute_withparams(fb_cursor, RARRAY_LEN(args), RARRAY_PTR(args));
 		} else {
 			isc_dsql_execute2(fb_connection->isc_status, &fb_connection->transact, &fb_cursor->stmt, SQLDA_VERSION1, NULL, NULL);
 			fb_error_check(fb_connection->isc_status);
@@ -2219,7 +2274,7 @@ static VALUE cursor_execute2(VALUE args)
 		}
 
 		if (in_params) {
-			fb_cursor_set_inputparams(fb_cursor, RARRAY(args)->len, RARRAY(args)->ptr);
+			fb_cursor_set_inputparams(fb_cursor, RARRAY_LEN(args), RARRAY_PTR(args));
 		}
 
 		/* Open cursor */
@@ -2237,9 +2292,7 @@ static VALUE cursor_execute2(VALUE args)
 		/* Set the description attributes */
 		fb_cursor->fields_ary = fb_cursor_fields_ary(fb_cursor->o_sqlda, fb_connection->downcase_names);
 		fb_cursor->fields_hash = fb_cursor_fields_hash(fb_cursor->fields_ary);
-		HERE("cursor_execute2 Z");
 	}
-	HERE("cursor_execute2 Z");
 	return result;
 }
 
@@ -2250,7 +2303,6 @@ static VALUE cursor_execute2(VALUE args)
  */
 static VALUE cursor_execute(int argc, VALUE* argv, VALUE self)
 {
-	HERE("cursor_execute");
 	struct FbCursor *fb_cursor;
 	struct FbConnection *fb_connection;
 	VALUE args;
@@ -2285,14 +2337,11 @@ static VALUE cursor_execute(int argc, VALUE* argv, VALUE self)
 			return rb_funcall(rb_mKernel, rb_intern("raise"), 0);
 		} else if (result != Qnil) {
 			fb_connection_commit(fb_connection);
-			HERE("cursor_execute X");
 			return result;
 		} else {
-			HERE("cursor_execute Y");
 			return result;
 		}
 	} else {
-		HERE("cursor_execute Z");
 		return cursor_execute2(args);
 	}
 }
@@ -2301,7 +2350,7 @@ static VALUE fb_hash_from_ary(VALUE fields, VALUE row)
 {
 	VALUE hash = rb_hash_new();
 	int i;
-	for (i = 0; i < RARRAY(fields)->len; i++) {
+	for (i = 0; i < RARRAY_LEN(fields); i++) {
 		VALUE field = rb_ary_entry(fields, i);
 		VALUE name = rb_struct_aref(field, LONG2NUM(0));
 		VALUE v = rb_ary_entry(row, i);
@@ -2464,9 +2513,9 @@ static VALUE cursor_drop(VALUE self)
 
 	/* reset the reference from connection */
 	Data_Get_Struct(fb_cursor->connection, struct FbConnection, fb_connection);
-	for (i = 0; i < RARRAY(fb_connection->cursor)->len; i++) {
-		if (RARRAY(fb_connection->cursor)->ptr[i] == self) {
-			RARRAY(fb_connection->cursor)->ptr[i] = Qnil;
+	for (i = 0; i < RARRAY_LEN(fb_connection->cursor); i++) {
+		if (RARRAY_PTR(fb_connection->cursor)[i] == self) {
+			RARRAY_PTR(fb_connection->cursor)[i] = Qnil;
 		}
 	}
 
@@ -2507,7 +2556,7 @@ static VALUE error_error_code(VALUE error)
 	return rb_iv_get(error, "error_code");
 }
 
-static char* dbp_create(int *length)
+static char* dbp_create(long *length)
 {
 	char *dbp = ALLOC_N(char, 1);
 	*dbp = isc_dpb_version1;
@@ -2515,11 +2564,11 @@ static char* dbp_create(int *length)
 	return dbp;
 }
 
-static char* dbp_add_string(char *dbp, char isc_dbp_code, char *s, int *length)
+static char* dbp_add_string(char *dbp, char isc_dbp_code, char *s, long *length)
 {
 	char *buf;
-	int old_length = *length;
-	int s_len = strlen(s);
+	long old_length = *length;
+	long s_len = strlen(s);
 	*length += 2 + s_len;
 	REALLOC_N(dbp, char, *length);
 	buf = dbp + old_length;
@@ -2529,7 +2578,7 @@ static char* dbp_add_string(char *dbp, char isc_dbp_code, char *s, int *length)
 	return dbp;
 }
 
-static char* connection_create_dbp(VALUE self, int *length)
+static char* connection_create_dbp(VALUE self, long *length)
 {
 	char *dbp;
 	VALUE username, password, charset, role;
@@ -2542,24 +2591,25 @@ static char* connection_create_dbp(VALUE self, int *length)
 	charset = rb_iv_get(self, "@charset");
 
 	dbp = dbp_create(length);
-	dbp = dbp_add_string(dbp, isc_dpb_user_name, STR2CSTR(username), length);
-	dbp = dbp_add_string(dbp, isc_dpb_password, STR2CSTR(password), length);
+	dbp = dbp_add_string(dbp, isc_dpb_user_name, StringValuePtr(username), length);
+	dbp = dbp_add_string(dbp, isc_dpb_password, StringValuePtr(password), length);
 	if (!NIL_P(charset)) {
-		dbp = dbp_add_string(dbp, isc_dpb_lc_ctype, STR2CSTR(charset), length);
+		dbp = dbp_add_string(dbp, isc_dpb_lc_ctype, StringValuePtr(charset), length);
 	}
 	if (!NIL_P(role)) {
-		dbp = dbp_add_string(dbp, isc_dpb_sql_role_name, STR2CSTR(role), length);
+		dbp = dbp_add_string(dbp, isc_dpb_sql_role_name, StringValuePtr(role), length);
 	}
 	return dbp;
 }
 
-static char* CONNECTION_PARMS[] = {
+static const char* CONNECTION_PARMS[] = {
 	"@database",
 	"@username",
 	"@password",
 	"@charset",
 	"@role",
 	"@downcase_names",
+	"@encoding",
 	(char *)0
 };
 
@@ -2568,7 +2618,7 @@ static VALUE connection_create(isc_db_handle handle, VALUE db)
 	unsigned short dialect;
 	unsigned short db_dialect;
 	VALUE downcase_names;
-	char *parm;
+	const char *parm;
 	int i;
 	struct FbConnection *fb_connection;
 	VALUE connection = Data_Make_Struct(rb_cFbConnection, struct FbConnection, fb_connection_mark, fb_connection_free, fb_connection);
@@ -2592,6 +2642,7 @@ static VALUE connection_create(isc_db_handle handle, VALUE db)
 	fb_connection->db_dialect = db_dialect;
 	downcase_names = rb_iv_get(db, "@downcase_names");
 	fb_connection->downcase_names = RTEST(downcase_names);
+	fb_connection->encoding = rb_iv_get(db, "@encoding");
 
 	for (i = 0; (parm = CONNECTION_PARMS[i]); i++) {
 		rb_iv_set(connection, parm, rb_iv_get(db, parm));
@@ -2600,7 +2651,7 @@ static VALUE connection_create(isc_db_handle handle, VALUE db)
 	return connection;
 }
 
-static VALUE connection_names(VALUE self, char *sql)
+static VALUE connection_names(VALUE self, const char *sql)
 {
 	VALUE row;
 	VALUE query = rb_str_new2(sql);
@@ -2629,7 +2680,7 @@ static VALUE connection_names(VALUE self, char *sql)
  */
 static VALUE connection_table_names(VALUE self)
 {
-	char *sql = "SELECT RDB$RELATION_NAME FROM RDB$RELATIONS "
+	const char *sql = "SELECT RDB$RELATION_NAME FROM RDB$RELATIONS "
 				"WHERE (RDB$SYSTEM_FLAG <> 1 OR RDB$SYSTEM_FLAG IS NULL) AND RDB$VIEW_BLR IS NULL "
 				"ORDER BY RDB$RELATION_NAME";
 	return connection_names(self, sql);
@@ -2642,7 +2693,7 @@ static VALUE connection_table_names(VALUE self)
  */
 static VALUE connection_generator_names(VALUE self)
 {
-	char *sql = "SELECT RDB$GENERATOR_NAME FROM RDB$GENERATORS "
+	const char *sql = "SELECT RDB$GENERATOR_NAME FROM RDB$GENERATORS "
 				"WHERE (RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG <> 1) "
 				"ORDER BY RDB$GENERATOR_NAME";
 	return connection_names(self, sql);
@@ -2655,7 +2706,7 @@ static VALUE connection_generator_names(VALUE self)
  */
 static VALUE connection_view_names(VALUE self)
 {
-	char *sql = "SELECT RDB$RELATION_NAME, RDB$OWNER_NAME, RDB$VIEW_SOURCE FROM RDB$RELATIONS "
+	const char *sql = "SELECT RDB$RELATION_NAME, RDB$OWNER_NAME, RDB$VIEW_SOURCE FROM RDB$RELATIONS "
 				"WHERE (RDB$SYSTEM_FLAG <> 1 OR RDB$SYSTEM_FLAG IS NULL) AND NOT RDB$VIEW_BLR IS NULL AND RDB$FLAGS = 1 "
 				"ORDER BY RDB$RELATION_ID";
 	return connection_names(self, sql);
@@ -2668,7 +2719,7 @@ static VALUE connection_view_names(VALUE self)
  */
 static VALUE connection_role_names(VALUE self)
 {
-	char *sql = "SELECT * FROM RDB$ROLES ORDER BY RDB$ROLE_NAME";
+	const char *sql = "SELECT * FROM RDB$ROLES WHERE RDB$SYSTEM_FLAG = 0 ORDER BY RDB$ROLE_NAME";
 	return connection_names(self, sql);
 }
 
@@ -2679,7 +2730,7 @@ static VALUE connection_role_names(VALUE self)
  */
 static VALUE connection_procedure_names(VALUE self)
 {
-	char *sql = "SELECT RDB$PROCEDURE_NAME FROM RDB$PROCEDURES "
+	const char *sql = "SELECT RDB$PROCEDURE_NAME FROM RDB$PROCEDURES "
 				"ORDER BY RDB$PROCEDURE_NAME";
 	return connection_names(self, sql);
 }
@@ -2691,7 +2742,7 @@ static VALUE connection_procedure_names(VALUE self)
  */
 static VALUE connection_trigger_names(VALUE self)
 {
-	char *sql = "SELECT RDB$TRIGGER_NAME FROM RDB$TRIGGERS "
+	const char *sql = "SELECT RDB$TRIGGER_NAME FROM RDB$TRIGGERS "
 				"ORDER BY RDB$TRIGGER_NAME";
 	return connection_names(self, sql);
 }
@@ -2705,12 +2756,12 @@ static VALUE connection_trigger_names(VALUE self)
 static VALUE connection_columns(VALUE self, VALUE table_name)
 {
     int i;
-	struct FbConnection *fb_connection;
-    VALUE re_default = rb_reg_new("^\\s*DEFAULT\\s+", strlen("^\\s*DEFAULT\\s+"), RE_OPTION_IGNORECASE);
+    struct FbConnection *fb_connection;
+    VALUE re_default = rb_reg_new("^\\s*DEFAULT\\s+", strlen("^\\s*DEFAULT\\s+"), IGNORECASE);
     VALUE re_rdb = rb_reg_new("^RDB\\$", strlen("^RDB\\$"), 0);
     VALUE empty = rb_str_new(NULL, 0);
     VALUE columns = rb_ary_new();
-    char *sql = "SELECT r.rdb$field_name NAME, r.rdb$field_source, f.rdb$field_type, f.rdb$field_sub_type, "
+    const char *sql = "SELECT r.rdb$field_name NAME, r.rdb$field_source, f.rdb$field_type, f.rdb$field_sub_type, "
                 "f.rdb$field_length, f.rdb$field_precision, f.rdb$field_scale SCALE, "
                 "COALESCE(r.rdb$default_source, f.rdb$default_source), "
                 "COALESCE(r.rdb$null_flag, f.rdb$null_flag) "
@@ -2719,11 +2770,11 @@ static VALUE connection_columns(VALUE self, VALUE table_name)
                 "WHERE UPPER(r.rdb$relation_name) = ? "
                 "ORDER BY r.rdb$field_position";
     VALUE query = rb_str_new2(sql);
-    table_name = rb_funcall(table_name, rb_intern("upcase"), 0);
-    VALUE query_parms[] = { query, table_name };
+    VALUE upcase_table_name = rb_funcall(table_name, rb_intern("upcase"), 0);
+    VALUE query_parms[] = { query, upcase_table_name };
     VALUE rs = connection_query(2, query_parms, self);
-	Data_Get_Struct(self, struct FbConnection, fb_connection);
-    for (i = 0; i < RARRAY(rs)->len; i++) {
+    Data_Get_Struct(self, struct FbConnection, fb_connection);
+    for (i = 0; i < RARRAY_LEN(rs); i++) {
         VALUE row = rb_ary_entry(rs, i);
         VALUE name = rb_ary_entry(row, 0);
         VALUE domain = rb_ary_entry(row, 1);
@@ -2734,23 +2785,25 @@ static VALUE connection_columns(VALUE self, VALUE table_name)
         VALUE scale = rb_ary_entry(row, 6);
         VALUE dflt = rb_ary_entry(row, 7);
         VALUE not_null = rb_ary_entry(row, 8);
-		rb_funcall(name, id_rstrip_bang, 0);
-		rb_funcall(domain, id_rstrip_bang, 0);
-		if (fb_connection->downcase_names && no_lowercase(name)) {
-			rb_funcall(name, id_downcase_bang, 0);
-		}
-		if (rb_funcall(re_rdb, rb_intern("match"), 1, domain) != Qnil) {
+        VALUE nullable;
+        VALUE column;
+        rb_funcall(name, id_rstrip_bang, 0);
+        rb_funcall(domain, id_rstrip_bang, 0);
+        if (fb_connection->downcase_names && no_lowercase(name)) {
+          rb_funcall(name, id_downcase_bang, 0);
+        }
+        if (rb_funcall(re_rdb, rb_intern("match"), 1, domain) != Qnil) {
             domain = Qnil;
         }
-		if (sql_subtype == Qnil) {
+        if (sql_subtype == Qnil) {
             sql_subtype = INT2NUM(0);
-		}
+        }
         sql_type = sql_type_from_code(self, sql_type, sql_subtype);
         if (dflt != Qnil) {
             rb_funcall(dflt, id_sub_bang, 2, re_default, empty);
         }
-        VALUE nullable = RTEST(not_null) ? Qfalse : Qtrue;
-		VALUE column = rb_struct_new(rb_sFbColumn, name, domain, sql_type, sql_subtype, length, precision, scale, dflt, nullable);
+        nullable = RTEST(not_null) ? Qfalse : Qtrue;
+        column = rb_struct_new(rb_sFbColumn, name, domain, sql_type, sql_subtype, length, precision, scale, dflt, nullable);
         rb_ary_push(columns, column);
     }
     rb_ary_freeze(columns);
@@ -2770,7 +2823,7 @@ char *p(char *prompt, VALUE s)
 
 static VALUE connection_index_columns(VALUE self, VALUE index_name)
 {
-	char *sql_columns = "SELECT * "
+	const char *sql_columns = "SELECT * "
 						"FROM RDB$INDEX_SEGMENTS "
 						"WHERE RDB$INDEX_SEGMENTS.RDB$INDEX_NAME = ? "
 						"ORDER BY RDB$INDEX_SEGMENTS.RDB$FIELD_POSITION";
@@ -2782,7 +2835,7 @@ static VALUE connection_index_columns(VALUE self, VALUE index_name)
 	struct FbConnection *fb_connection;
 	Data_Get_Struct(self, struct FbConnection, fb_connection);
 
-	for (i = 0; i < RARRAY(result)->len; i++) {
+	for (i = 0; i < RARRAY_LEN(result); i++) {
 		VALUE row = rb_ary_entry(result, i);
 		VALUE name = rb_ary_entry(row, 1);
 		rb_funcall(name, id_rstrip_bang, 0);
@@ -2801,7 +2854,7 @@ static VALUE connection_index_columns(VALUE self, VALUE index_name)
  */
 static VALUE connection_indexes(VALUE self)
 {
-	char *sql_indexes = "SELECT RDB$INDICES.RDB$RELATION_NAME, RDB$INDICES.RDB$INDEX_NAME, RDB$INDICES.RDB$UNIQUE_FLAG, RDB$INDICES.RDB$INDEX_TYPE "
+	const char *sql_indexes = "SELECT RDB$INDICES.RDB$RELATION_NAME, RDB$INDICES.RDB$INDEX_NAME, RDB$INDICES.RDB$UNIQUE_FLAG, RDB$INDICES.RDB$INDEX_TYPE "
 						"FROM RDB$INDICES "
 						"  JOIN RDB$RELATIONS ON RDB$INDICES.RDB$RELATION_NAME = RDB$RELATIONS.RDB$RELATION_NAME "
 						"WHERE (RDB$RELATIONS.RDB$SYSTEM_FLAG <> 1 OR RDB$RELATIONS.RDB$SYSTEM_FLAG IS NULL) ";
@@ -2812,7 +2865,7 @@ static VALUE connection_indexes(VALUE self)
 	struct FbConnection *fb_connection;
 	Data_Get_Struct(self, struct FbConnection, fb_connection);
 
-	for (i = 0; i < RARRAY(ary_indexes)->len; i++) {
+	for (i = 0; i < RARRAY_LEN(ary_indexes); i++) {
 		VALUE index_struct;
 		VALUE row = rb_ary_entry(ary_indexes, i);
 		VALUE table_name = rb_ary_entry(row, 0);
@@ -2857,14 +2910,14 @@ static void define_attrs(VALUE klass, char **attrs)
 }
 */
 
-static VALUE default_string(VALUE hash, char *key, char *def)
+static VALUE default_string(VALUE hash, const char *key, const char *def)
 {
 	VALUE sym = ID2SYM(rb_intern(key));
 	VALUE val = rb_hash_aref(hash, sym);
 	return NIL_P(val) ? rb_str_new2(def) : StringValue(val);
 }
 
-static VALUE default_int(VALUE hash, char *key, int def)
+static VALUE default_int(VALUE hash, const char *key, int def)
 {
 	VALUE sym = ID2SYM(rb_intern(key));
 	VALUE val = rb_hash_aref(hash, sym);
@@ -2873,9 +2926,9 @@ static VALUE default_int(VALUE hash, char *key, int def)
 
 static VALUE database_allocate_instance(VALUE klass)
 {
-    NEWOBJ(obj, struct RObject);
-    OBJSETUP(obj, klass, T_OBJECT);
-    return (VALUE)obj;
+	NEWOBJ(obj, struct RObject);
+	OBJSETUP(obj, klass, T_OBJECT);
+	return (VALUE)obj;
 }
 
 static VALUE hash_from_connection_string(VALUE cs)
@@ -2886,10 +2939,10 @@ static VALUE hash_from_connection_string(VALUE cs)
 	ID id_split = rb_intern("split");
 	VALUE pairs = rb_funcall(cs, id_split, 1, re_SemiColon);
 	int i;
-	for (i = 0; i < RARRAY(pairs)->len; i++) {
+	for (i = 0; i < RARRAY_LEN(pairs); i++) {
 		VALUE pair = rb_ary_entry(pairs, i);
 		VALUE keyValue = rb_funcall(pair, id_split, 1, re_Equal);
-		if (RARRAY(keyValue)->len == 2) {
+		if (RARRAY_LEN(keyValue) == 2) {
 			VALUE key = rb_ary_entry(keyValue, 0);
 			VALUE val = rb_ary_entry(keyValue, 1);
 			rb_hash_aset(hash, rb_str_intern(key), val);
@@ -2936,6 +2989,7 @@ static VALUE database_initialize(int argc, VALUE *argv, VALUE self)
 		rb_iv_set(self, "@charset", default_string(parms, "charset", "NONE"));
 		rb_iv_set(self, "@role", rb_hash_aref(parms, ID2SYM(rb_intern("role"))));
 		rb_iv_set(self, "@downcase_names", rb_hash_aref(parms, ID2SYM(rb_intern("downcase_names"))));
+		rb_iv_set(self, "@encoding", default_string(parms, "encoding", "ASCII-8BIT"));
 		rb_iv_set(self, "@page_size", default_int(parms, "page_size", 1024));
 	}
 	return self;
@@ -3015,13 +3069,13 @@ static VALUE database_connect(VALUE self)
 {
 	ISC_STATUS isc_status[20];
 	char *dbp;
-	int length;
+	long length;
 	isc_db_handle handle = 0;
 	VALUE database = rb_iv_get(self, "@database");
 
 	Check_Type(database, T_STRING);
 	dbp = connection_create_dbp(self, &length);
-	isc_attach_database(isc_status, 0, STR2CSTR(database), &handle, length, dbp);
+	isc_attach_database(isc_status, 0, StringValuePtr(database), &handle, length, dbp);
 	xfree(dbp);
 	fb_error_check(isc_status);
 	{
@@ -3082,7 +3136,6 @@ static VALUE database_s_drop(int argc, VALUE *argv, VALUE klass)
 
 void Init_fb()
 {
-	HERE("Init_fb");
 	rb_mFb = rb_define_module("Fb");
 
 	rb_cFbDatabase = rb_define_class_under(rb_mFb, "Database", rb_cData);
@@ -3094,6 +3147,7 @@ void Init_fb()
 	rb_define_attr(rb_cFbDatabase, "charset", 1, 1);
 	rb_define_attr(rb_cFbDatabase, "role", 1, 1);
 	rb_define_attr(rb_cFbDatabase, "downcase_names", 1, 1);
+	rb_define_attr(rb_cFbDatabase, "encoding", 1, 1);
 	rb_define_attr(rb_cFbDatabase, "page_size", 1, 1);
     rb_define_method(rb_cFbDatabase, "create", database_create, 0);
 	rb_define_singleton_method(rb_cFbDatabase, "create", database_s_create, -1);
@@ -3109,6 +3163,7 @@ void Init_fb()
 	rb_define_attr(rb_cFbConnection, "charset", 1, 1);
 	rb_define_attr(rb_cFbConnection, "role", 1, 1);
 	rb_define_attr(rb_cFbConnection, "downcase_names", 1, 1);
+	rb_define_attr(rb_cFbConnection, "encoding", 1, 1);
 	rb_define_method(rb_cFbConnection, "to_s", connection_to_s, 0);
 	rb_define_method(rb_cFbConnection, "execute", connection_execute, -1);
 	rb_define_method(rb_cFbConnection, "query", connection_query, -1);
@@ -3144,11 +3199,11 @@ void Init_fb()
 	rb_define_singleton_method(rb_cFbSqlType, "from_code", sql_type_from_code, 2);
 
 /*
-//	rb_cFbGlobal = rb_define_class_under(rb_mFb, "Global", rb_cData);
-//	rb_define_singleton_method(rb_cFbGlobal, "transaction", global_transaction, -1);
-//	rb_define_singleton_method(rb_cFbGlobal, "transaction_started", global_transaction_started, 0);
-//	rb_define_singleton_method(rb_cFbGlobal, "commit", global_commit, 0);
-//	rb_define_singleton_method(rb_cFbGlobal, "rollback", global_rollback, 0);
+	rb_cFbGlobal = rb_define_class_under(rb_mFb, "Global", rb_cData);
+	rb_define_singleton_method(rb_cFbGlobal, "transaction", global_transaction, -1);
+	rb_define_singleton_method(rb_cFbGlobal, "transaction_started", global_transaction_started, 0);
+	rb_define_singleton_method(rb_cFbGlobal, "commit", global_commit, 0);
+	rb_define_singleton_method(rb_cFbGlobal, "rollback", global_rollback, 0);
 */
 
 	rb_eFbError = rb_define_class_under(rb_mFb, "Error", rb_eStandardError);
@@ -3168,4 +3223,5 @@ void Init_fb()
 	rb_global_variable(&re_lowercase);
 	id_rstrip_bang = rb_intern("rstrip!");
     id_sub_bang = rb_intern("sub!");
+    id_force_encoding = rb_intern("force_encoding");
 }

data/test/ConnectionTestCases.rb

@@ -144,9 +144,9 @@ class ConnectionTestCases < Test::Unit::TestCase
       affected = connection.execute(sql_update, 5)
       assert_equal 5, affected
       affected = connection.execute(sql_delete, 5)
-      assert 4, affected
+      assert_equal 4, affected
       rows = connection.execute(sql_select) do |cursor| cursor.fetchall end
-      assert 6, rows.size
+      assert_equal 6, rows.size
     end
   end
 

data/test/EncodingTestCases.rb

@@ -0,0 +1,40 @@
+#coding:utf-8
+require 'test/unit'
+require 'test/FbTestCases'
+
+class EncodingTestCases < Test::Unit::TestCase
+  include FbTestCases
+
+  def test_encoding
+    sql_schema = <<-END
+      create table TEST (
+        ID INTEGER,
+        C10 CHAR(10),
+        VC10 VARCHAR(10),
+        MEMO BLOB SUB_TYPE TEXT)
+      END
+    sql_insert = <<-END
+      insert into test 
+        (ID, C10, VC10, MEMO) 
+        values
+        (?, ?, ?, ?);
+      END
+    sql_select = "select * from TEST order by ID"
+    lorem = "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+    Database.create(@parms.update(:encoding => "UTF-8")) do |connection|
+      connection.execute(sql_schema);
+
+      connection.execute(sql_insert, 1, "abcdef", "한글", lorem)
+
+      row = connection.query(sql_select).first
+      assert_equal 1, row[0]
+      assert_equal  Encoding::UTF_8, row[1].encoding
+      assert_equal "abcdef    ", row[1]
+      assert_equal  Encoding::UTF_8, row[2].encoding
+      assert_equal "한글", row[2]
+      assert_equal  Encoding::UTF_8, row[3].encoding
+      assert_equal lorem, row[3]
+    end
+  end
+end

data/test/FbTestSuite.rb

@@ -6,3 +6,6 @@ require 'ConnectionTestCases'
 require 'CursorTestCases'
 require 'DataTypesTestCases'
 require 'TransactionTestCases'
+if RUBY_VERSION =~ /^1.9/
+  require 'EncodingTestCases'
+end

metadata

@@ -1,32 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fb
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 7
-  version: 0.6.7
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brent Rowland
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-03-27 00:00:00 -07:00
-default_executable: 
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: rowland@rowlandresearch.com
 executables: []
-
-extensions: 
+extensions:
 - extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - extconf.rb
 - fb.c
 - README
@@ -35,43 +27,40 @@ files:
 - test/CursorTestCases.rb
 - test/DatabaseTestCases.rb
 - test/DataTypesTestCases.rb
+- test/EncodingTestCases.rb
 - test/FbTestCases.rb
 - test/FbTestSuite.rb
 - test/TransactionTestCases.rb
-has_rdoc: true
 homepage: http://github.com/rowland/fb
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Fb -- Ruby Firebird Extension
 - --main
 - README
 - -x
 - test
-require_paths: 
+require_paths:
 - .
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - Firebird client library fbclient.dll, libfbclient.so or Firebird.framework.
 rubyforge_project: fblib
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Firebird and Interbase driver
-test_files: 
+test_files:
 - test/FbTestSuite.rb