fb 0.5.4 → 0.5.5

data/extconf.rb

@@ -26,7 +26,11 @@ case RUBY_PLATFORM
     $CFLAGS  = $CFLAGS + " -DOS_WIN32"
     libs.push "fbclient_ms"
   when /darwin/
-    #$CFLAGS  = $CFLAGS + " -DOS_UNIX"
+    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 : '' }
     $CPPFLAGS += " -I/Library/Frameworks/Firebird.framework/Headers"
     $LDFLAGS += " -framework Firebird"
   when /linux/

data/fb.c

@@ -158,6 +158,7 @@ static long calculate_buffsize(XSQLDA *sqlda)
 	return offset;
 }
 
+#if (FB_API_VER >= 20)
 static VALUE fb_error_msg(const ISC_STATUS *isc_status)
 {
 	char msg[512];
@@ -169,6 +170,19 @@ static VALUE fb_error_msg(const ISC_STATUS *isc_status)
 	}
 	return result;
 }
+#else
+static VALUE fb_error_msg(ISC_STATUS *isc_status)
+{
+	char msg[512];
+	VALUE result = rb_str_new(NULL, 0);
+	while (isc_interprete(msg, &isc_status))
+	{
+		result = rb_str_cat(result, msg, strlen(msg));
+		result = rb_str_cat(result, "\n", strlen("\n"));
+	}
+	return result;
+}
+#endif
 
 struct time_object {
     struct timeval tv;
@@ -2861,7 +2875,7 @@ static VALUE database_s_create(int argc, VALUE *argv, VALUE klass)
  */
 static VALUE database_connect(VALUE self)
 {
-	long isc_status[20];
+	ISC_STATUS isc_status[20];
 	char *dbp;
 	int length;
 	isc_db_handle handle = NULL;

metadata

@@ -1,26 +1,33 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: fb
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
-platform: ruby
-authors: []
-
+  version: 0.5.5
+date: 2008-01-03 00:00:00 -07:00
+summary: Firebird and Interbase driver
+require_paths: 
+- .
+email: rowland@rowlandresearch.com
+homepage: http://www.rowlandresearch.com/ruby/
+rubyforge_project: fblib
+description: 
 autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2007-12-13 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: 
-email: rowland@rowlandresearch.com
-executables: []
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: []
 
-extensions: 
-- extconf.rb
-extra_rdoc_files: 
-- README
 files: 
 - extconf.rb
 - fb.c
@@ -32,9 +39,8 @@ files:
 - test/FbTestCases.rb
 - test/FbTestSuite.rb
 - test/TransactionTestCases.rb
-has_rdoc: true
-homepage: http://www.rowlandresearch.com/ruby/
-post_install_message: 
+test_files: 
+- test/FbTestSuite.rb
 rdoc_options: 
 - --title
 - Fb -- Ruby Firebird Extension
@@ -42,26 +48,13 @@ rdoc_options:
 - README
 - -x
 - test
-require_paths: 
-- .
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+extra_rdoc_files: 
+- README
+executables: []
+
+extensions: 
+- extconf.rb
 requirements: 
 - Firebird client library fbclient.dll
-rubyforge_project: fblib
-rubygems_version: 0.9.5
-signing_key: 
-specification_version: 2
-summary: Firebird and Interbase driver
-test_files: 
-- test/FbTestSuite.rb
+dependencies: []
+