fb 0.5.10 → 0.6.2

data/extconf.rb

@@ -27,10 +27,10 @@ case RUBY_PLATFORM
     libs.push "fbclient_ms"
   when /darwin/
     hosttype = `uname -m`.chomp
-    #$CFLAGS += " -DOS_UNIX"
-    $CFLAGS.gsub!(/-arch (\w+)/) { |m| $1 == hosttype ? m : '' }
-    $LDFLAGS.gsub!(/-arch (\w+)/) { |m| $1 == hosttype ? m : '' }
-    CONFIG['LDSHARED'].gsub!(/-arch (\w+)/) { |m| $1 == hosttype ? m : '' }
+    $CFLAGS += " -DOS_UNIX"
+#    $CFLAGS.gsub!(/-arch (\w+)/) { |m| $1 == hosttype ? m : '' }
+#    $LDFLAGS.gsub!(/-arch (\w+)/) { |m| $1 == hosttype ? m : '' }
+#    CONFIG['LDSHARED'].gsub!(/-arch (\w+)/) { |m| $1 == hosttype ? m : '' }
     $CPPFLAGS += " -I/Library/Frameworks/Firebird.framework/Headers"
     $LDFLAGS += " -framework Firebird"
   when /linux/

data/fb.c

@@ -53,13 +53,14 @@ static VALUE rb_cFbSqlType;
 static VALUE rb_eFbError;
 static VALUE rb_sFbField;
 static VALUE rb_sFbIndex;
-
+static VALUE rb_sFbColumn;
 static VALUE rb_cDate;
 
 static ID id_matches;
 static ID id_downcase_bang;
 static VALUE re_lowercase;
 static ID id_rstrip_bang;
+static ID id_sub_bang;
 
 /* static char isc_info_stmt[] = { isc_info_sql_stmt_type }; */
 /* static char isc_info_buff[16]; */
@@ -136,7 +137,7 @@ typedef struct trans_opts
 #define	UPPER(c)	(((c) >= 'a' && (c)<= 'z') ? (c) - 'a' + 'A' : (c))
 #define	FREE(p)		if (p)	{ xfree(p); p = 0; }
 #define	SETNULL(p)	if (p && strlen(p) == 0)	{ p = 0; }
-/* #define HERE(s) printf("%s\n", s) */
+ // #define HERE(s) printf("%s\n", s) 
 #define HERE(s)
 
 static long calculate_buffsize(XSQLDA *sqlda)
@@ -207,11 +208,11 @@ struct time_object {
 #define GetTimeval(obj, tobj) \
     Data_Get_Struct(obj, struct time_object, tobj)
 
-static VALUE fb_mktime(struct tm *tm)
+static VALUE fb_mktime(struct tm *tm, char *which)
 {
 	return rb_funcall(
-		rb_cTime, rb_intern("utc"), 6,
-		INT2FIX(tm->tm_year), INT2FIX(tm->tm_mon), INT2FIX(tm->tm_mday),
+		rb_cTime, rb_intern(which), 6,
+		INT2FIX(tm->tm_year), INT2FIX(tm->tm_mon + 1), INT2FIX(tm->tm_mday),
 		INT2FIX(tm->tm_hour), INT2FIX(tm->tm_min), INT2FIX(tm->tm_sec));
 }
 
@@ -371,7 +372,17 @@ static VALUE fb_sql_type_from_code(int code, int subtype)
 	return rb_str_new2(sql_type);
 }
 
-static void fb_error_check(long *isc_status)
+/* call-seq:
+ *   from_code(code, subtype) -> String
+ *
+ * Returns the SQL type, such as VARCHAR or INTEGER for a given type code and subtype.
+ */
+static VALUE sql_type_from_code(VALUE self, VALUE code, VALUE subtype)
+{
+	return fb_sql_type_from_code(NUM2INT(code), NUM2INT(subtype));
+}
+
+static void fb_error_check(ISC_STATUS *isc_status)
 {
 	HERE("fb_error_check");
 	if (isc_status[0] == 1 && isc_status[1]) {
@@ -393,7 +404,7 @@ static void fb_error_check(long *isc_status)
 	HERE("fb_error_check 2");
 }
 
-static void fb_error_check_warn(long *isc_status)
+static void fb_error_check_warn(ISC_STATUS *isc_status)
 {
 	short code = isc_sqlcode(isc_status);
 	if (code != 0) {
@@ -1493,7 +1504,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 							ratio *= 10;
 						obj = double_from_obj(obj);
 						dvalue = NUM2DBL(obj) * ratio;
-						lvalue = (long)(dvalue + 0.5);
+						lvalue = (ISC_LONG)(dvalue + 0.5);
 					} else {
 						obj = long_from_obj(obj);
 						lvalue = NUM2LONG(obj);
@@ -1514,12 +1525,15 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 							ratio *= 10;
 						obj = double_from_obj(obj);
 						dvalue = NUM2DBL(obj) * ratio;
-						lvalue = (long)(dvalue + 0.5);
+						lvalue = (ISC_LONG)(dvalue + 0.5);
 					} else {
 						obj = long_from_obj(obj);
 						lvalue = NUM2LONG(obj);
 					}
-					*(long *)var->sqldata = lvalue;
+					if (lvalue < -2147483647 || lvalue > 2147483647) {
+                        rb_raise(rb_eRangeError, "integer overflow");
+					}
+					*(ISC_LONG *)var->sqldata = lvalue;
 					offset += alignment;
 					break;
 
@@ -1562,7 +1576,7 @@ static void fb_cursor_set_inputparams(struct FbCursor *fb_cursor, int argc, VALU
 					var->sqldata = (char *)(fb_cursor->i_buffer + offset);
 					obj = rb_obj_as_string(obj);
 
-					blob_handle = NULL;
+					blob_handle = 0;
 					isc_create_blob2(
 						fb_connection->isc_status,&fb_connection->db,&fb_connection->transact,
 						&blob_handle,&blob_id,0,NULL);
@@ -1869,7 +1883,6 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 	isc_blob_handle blob_handle;
 	ISC_QUAD blob_id;
 	unsigned short actual_seg_len;
-	time_t t;
 	static char blob_items[] = {
 		isc_info_blob_max_segment,
 		isc_info_blob_num_segments,
@@ -1936,10 +1949,10 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 					if (var->sqlscale < 0) {
 						ratio = 1;
 						for (scnt = 0; scnt > var->sqlscale; scnt--) ratio *= 10;
-						dval = (double)*(long*)var->sqldata/ratio;
+						dval = (double)*(ISC_LONG*)var->sqldata/ratio;
 						val = rb_float_new(dval);
 					} else {
-						val = INT2NUM(*(long*)var->sqldata);
+						val = INT2NUM(*(ISC_LONG*)var->sqldata);
 					}
 					break;
 
@@ -1964,23 +1977,15 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 #endif
 				case SQL_TIMESTAMP:
 					isc_decode_timestamp((ISC_TIMESTAMP *)var->sqldata, &tms);
-					t = mktime(&tms);
-                    if (t < 0) t = 0;
-                    val = rb_time_new(t, 0);
-                    rb_funcall(val, rb_intern("localtime"), 0);
+					val = fb_mktime(&tms, "local");
 					break;
 
 				case SQL_TYPE_TIME:
 					isc_decode_sql_time((ISC_TIME *)var->sqldata, &tms);
-					/*
-					t = mktime(&tms);
-					if (t < 0) t = t + (24 * 60 * 60);
-					val = rb_time_new(t, 0);
-					*/
 					tms.tm_year = 2000;
-					tms.tm_mon = 1;
+					tms.tm_mon = 0;
 					tms.tm_mday = 1;
-					val = fb_mktime(&tms);
+					val = fb_mktime(&tms, "utc");
 					break;
 
 				case SQL_TYPE_DATE:
@@ -1989,7 +1994,7 @@ static VALUE fb_cursor_fetch(struct FbCursor *fb_cursor)
 					break;
 
 				case SQL_BLOB:
-					blob_handle = NULL;
+					blob_handle = 0;
 					blob_id = *(ISC_QUAD *)var->sqldata;
 					isc_open_blob2(fb_connection->isc_status, &fb_connection->db, &fb_connection->transact, &blob_handle, &blob_id, 0, NULL);
 					fb_error_check(fb_connection->isc_status);
@@ -2642,6 +2647,79 @@ static VALUE connection_procedure_names(VALUE self)
 	return connection_names(self, sql);
 }
 
+/* call-seq:
+ *   trigger_names() -> array
+ *
+ * Returns sorted array of trigger names in connected database.
+ */
+static VALUE connection_trigger_names(VALUE self)
+{
+	char *sql = "SELECT RDB$TRIGGER_NAME FROM RDB$TRIGGERS "
+				"ORDER BY RDB$TRIGGER_NAME";
+	return connection_names(self, sql);
+}
+
+/* call-seq:
+ *   columns(table_name) -> array
+ *
+ * Returns array of objects describing each column of table_name.
+ */
+
+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);
+    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, "
+                "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) "
+                "FROM rdb$relation_fields r "
+                "JOIN rdb$fields f ON r.rdb$field_source = f.rdb$field_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 rs = connection_query(2, query_parms, self);
+	Data_Get_Struct(self, struct FbConnection, fb_connection);
+    for (i = 0; i < RARRAY(rs)->len; i++) {
+        VALUE row = rb_ary_entry(rs, i);
+        VALUE name = rb_ary_entry(row, 0);
+        VALUE domain = rb_ary_entry(row, 1);
+        VALUE sql_type = rb_ary_entry(row, 2);
+        VALUE sql_subtype = rb_ary_entry(row, 3);
+        VALUE length = rb_ary_entry(row, 4);
+        VALUE precision = rb_ary_entry(row, 5);
+        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) {
+            domain = 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);
+        rb_ary_push(columns, column);
+    }
+    rb_ary_freeze(columns);
+    return columns;
+}
+
 char *p(char *prompt, VALUE s)
 {
 	char *sz;
@@ -2730,16 +2808,6 @@ static VALUE connection_indexes(VALUE self)
 	return indexes;
 }
 
-/* call-seq:
- *   from_code(code, subtype) -> String
- *
- * Returns the SQL type, such as VARCHAR or INTEGER for a given type code and subtype.
- */
-static VALUE sql_type_from_code(VALUE self, VALUE code, VALUE subtype)
-{
-	return fb_sql_type_from_code(NUM2INT(code), NUM2INT(subtype));
-}
-
 /*
 static void define_attrs(VALUE klass, char **attrs)
 {
@@ -2911,7 +2979,7 @@ static VALUE database_connect(VALUE self)
 	ISC_STATUS isc_status[20];
 	char *dbp;
 	int length;
-	isc_db_handle handle = NULL;
+	isc_db_handle handle = 0;
 	VALUE database = rb_iv_get(self, "@database");
 
 	Check_Type(database, T_STRING);
@@ -3021,7 +3089,9 @@ void Init_fb()
 	rb_define_method(rb_cFbConnection, "view_names", connection_view_names, 0);
 	rb_define_method(rb_cFbConnection, "role_names", connection_role_names, 0);
 	rb_define_method(rb_cFbConnection, "procedure_names", connection_procedure_names, 0);
+	rb_define_method(rb_cFbConnection, "trigger_names", connection_trigger_names, 0);
 	rb_define_method(rb_cFbConnection, "indexes", connection_indexes, 0);
+	rb_define_method(rb_cFbConnection, "columns", connection_columns, 1);
 	/* rb_define_method(rb_cFbConnection, "cursor", connection_cursor, 0); */
 
 	rb_cFbCursor = rb_define_class_under(rb_mFb, "Cursor", rb_cData);
@@ -3049,7 +3119,8 @@ void Init_fb()
 
 	rb_sFbField = rb_struct_define("FbField", "name", "sql_type", "sql_subtype", "display_size", "internal_size", "precision", "scale", "nullable", "type_code", NULL);
 	rb_sFbIndex = rb_struct_define("FbIndex", "table_name", "index_name", "unique", "descending", "columns", NULL);
-	
+	rb_sFbColumn = rb_struct_define("FbColumn", "name", "domain", "sql_type", "sql_subtype", "length", "precision", "scale", "default", "nullable", NULL);
+
 	rb_require("date");
 	rb_require("time"); /* Needed as of Ruby 1.8.5 */
 	rb_cDate = rb_const_get(rb_cObject, rb_intern("Date"));
@@ -3059,4 +3130,5 @@ void Init_fb()
 	re_lowercase = rb_reg_regcomp(rb_str_new2("[[:lower:]]"));
 	rb_global_variable(&re_lowercase);
 	id_rstrip_bang = rb_intern("rstrip!");
+    id_sub_bang = rb_intern("sub!");
 }

data/fb_extensions.rb

@@ -0,0 +1,21 @@
+module Fb
+  class Connection
+    def execute_script(sql)
+      stmts = []
+      delim = ';'
+      while sql =~ /\S/
+        stmt, sql = sql.split(delim, 2)
+        if stmt =~ /^\s*set\s+term\s+(\S+)/i
+          delim = $1
+        elsif stmt =~ /\S/
+          stmts << stmt
+        end
+      end
+      self.transaction do
+        stmts.each do |stmt|
+          self.execute(stmt)
+        end
+      end
+    end
+  end
+end

data/test/ConnectionTestCases.rb

@@ -381,6 +381,40 @@ class ConnectionTestCases < Test::Unit::TestCase
       assert_equal 'plusone', names[0]
     end
   end
+  
+  def test_trigger_names
+    table_schema = "CREATE TABLE TEST (ID INT, NAME VARCHAR(20)); CREATE GENERATOR TEST_SEQ;"
+    trigger_schema = <<-END_SQL
+      CREATE TRIGGER TEST_INSERT FOR TEST ACTIVE BEFORE INSERT AS
+      BEGIN
+        IF (NEW.ID IS NULL) THEN
+          NEW.ID = CAST(GEN_ID(TEST_SEQ, 1) AS INT);
+      END
+    END_SQL
+    Database.create(@parms) do |connection|
+      connection.execute_script(table_schema)
+      connection.execute(trigger_schema)
+      names = connection.trigger_names
+      assert names.include?('TEST_INSERT')
+    end
+  end
+
+  def test_trigger_names_downcased
+    table_schema = "CREATE TABLE TEST (ID INT, NAME VARCHAR(20)); CREATE GENERATOR TEST_SEQ;"
+    trigger_schema = <<-END_SQL
+      CREATE TRIGGER TEST_INSERT FOR TEST ACTIVE BEFORE INSERT AS
+      BEGIN
+        IF (NEW.ID IS NULL) THEN
+          NEW.ID = CAST(GEN_ID(TEST_SEQ, 1) AS INT);
+      END
+    END_SQL
+    Database.create(@parms.merge(:downcase_names => true)) do |connection|
+      connection.execute_script(table_schema)
+      connection.execute(trigger_schema)
+      names = connection.trigger_names
+      assert names.include?('test_insert')
+    end
+  end
 
   def test_index_names
     sql_schema = <<-END
@@ -459,4 +493,51 @@ class ConnectionTestCases < Test::Unit::TestCase
       connection.drop
     end
   end
+
+  def test_columns
+    sql_schema = <<-END
+      create domain STRING10 as VARCHAR(10);
+      create table TEST (
+        I INTEGER,
+        SI SMALLINT,
+        BI BIGINT,
+        F FLOAT, 
+        D DOUBLE PRECISION,
+        C CHAR,
+        C10 CHAR(10),
+        VC VARCHAR(1),
+        VC10 STRING10,
+        VC10000 VARCHAR(10000),
+        DT DATE,
+        TM TIME,
+        TS TIMESTAMP,
+        N92 NUMERIC(9,2),
+        D92 DECIMAL(9,2));
+    END
+    expected = [
+      # name, domain, sql_type, sql_subtype, length, precision, scale, default, nullable
+      Struct::FbColumn.new("I",       nil,        "INTEGER",          0, 4,     0,   0,  nil, true),
+      Struct::FbColumn.new("SI",      nil,        "SMALLINT",         0, 2,     0,   0,  nil, true),
+      Struct::FbColumn.new("BI",      nil,        "BIGINT",           0, 8,     0,   0,  nil, true),
+      Struct::FbColumn.new("F",       nil,        "FLOAT",            0, 4,     nil, 0,  nil, true),
+      Struct::FbColumn.new("D",       nil,        "DOUBLE PRECISION", 0, 8,     nil, 0,  nil, true),
+      Struct::FbColumn.new("C",       nil,        "CHAR",             0, 1,     nil, 0,  nil, true),
+      Struct::FbColumn.new("C10",     nil,        "CHAR",             0, 10,    nil, 0,  nil, true),
+      Struct::FbColumn.new("VC",      nil,        "VARCHAR",          0, 1,     nil, 0,  nil, true),
+      Struct::FbColumn.new("VC10",    "STRING10", "VARCHAR",          0, 10,    nil, 0,  nil, true),
+      Struct::FbColumn.new("VC10000", nil,        "VARCHAR",          0, 10000, nil, 0,  nil, true),
+      Struct::FbColumn.new("DT",      nil,        "DATE",             0, 4,     nil, 0,  nil, true),
+      Struct::FbColumn.new("TM",      nil,        "TIME",             0, 4,     nil, 0,  nil, true),
+      Struct::FbColumn.new("TS",      nil,        "TIMESTAMP",        0, 8,     nil, 0,  nil, true),
+      Struct::FbColumn.new("N92",     nil,        "NUMERIC",          1, 4,     9,   -2, nil, true),
+      Struct::FbColumn.new("D92",     nil,        "DECIMAL",          2, 4,     9,   -2, nil, true),
+    ]
+    Database.create(@parms) do |connection|
+      connection.execute_script(sql_schema)
+      columns = connection.columns('TEST')
+      expected.each_with_index do |column, i|
+        assert_equal column, columns[i]
+      end
+    end
+  end    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fb
 version: !ruby/object:Gem::Version 
-  version: 0.5.10
+  version: 0.6.2
 platform: ruby
 authors: 
 - Brent Rowland
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,7 @@ files:
 - extconf.rb
 - fb.c
 - README
+- fb_extensions.rb
 - test/ConnectionTestCases.rb
 - test/CursorTestCases.rb
 - test/DatabaseTestCases.rb
@@ -33,9 +34,7 @@ files:
 - test/FbTestSuite.rb
 - test/TransactionTestCases.rb
 has_rdoc: true
-homepage: http://www.rowlandresearch.com/ruby/
-licenses: []
-
+homepage: http://github.com/rowland/fb
 post_install_message: 
 rdoc_options: 
 - --title
@@ -59,11 +58,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- Firebird client library fbclient.dll
+- Firebird client library fbclient.dll, libfbclient.so or Firebird.framework.
 rubyforge_project: fblib
-rubygems_version: 1.3.3
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Firebird and Interbase driver
 test_files: 
 - test/FbTestSuite.rb