sqlanywhere 0.1.1-i386-mswin32 → 0.1.2-i386-mswin32

data/CHANGELOG

@@ -1,5 +1,10 @@
 =CHANGE LOG
 
+=====0.1.2 -- 2008/12/18
+- Fixed bug when trying to read input value from OUTPUT parameter
+- Added error checking to C2RB
+- Fixed Rake to handle .bundle on OSX
+
 =====0.1.1 -- 2008/11/06
 - Created a source gem rake task
 - Created a 'hint' file if the source gem is used directly

data/LICENSE

@@ -1,6 +1,6 @@
 /*====================================================
 *
-*   Copyright 2008 iAnywhere Solutions, Inc.
+*   Copyright 2008-2009 iAnywhere Solutions, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.

data/Rakefile

@@ -1,6 +1,6 @@
 #====================================================
 #
-#    Copyright 2008 iAnywhere Solutions, Inc.
+#    Copyright 2008-2009 iAnywhere Solutions, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,6 +43,8 @@ ARCH=Config::CONFIG['arch']
 
 pkg_version = ""
 
+library_file = ARCH =~ /darwin/ ? "sqlanywhere.bundle" : "sqlanywhere.so"
+
 # The package version of determined by parsing the c source file. This ensures the version is
 # only ever specified ins a single place.
 File.open(File.join("ext", "sqlanywhere.c") ) do |f|
@@ -86,7 +88,7 @@ end
 
 # The default task is to build the library (.dll or .so)
 desc "Build the library"
-task :default => ["lib/sqlanywhere.so"]
+task :default => [File.join("lib", library_file)]
 
 # Builds the binary gem for this platform
 desc "Build the gem"
@@ -98,7 +100,7 @@ file "sqlanywhere-#{pkg_version}-#{spec.platform}.gem" => ["Rakefile",
                                              "README", 
                                              "CHANGELOG", 
                                              "LICENSE", 
-                                             "lib/sqlanywhere.so"] do
+                                             File.join("lib", library_file)] do
    # Get the updated list of files to include in the gem
    spec.files = Dir['ext/**/*'] + Dir['lib/**/*'] + Dir['test/**/*'] + Dir['CHANGELOG'] + Dir['LICENSE'] + Dir['README'] + Dir['Rakefile']
    # Set the gem to be platform specific since it includes compiled binaries   
@@ -130,13 +132,13 @@ file "sqlanywhere-#{pkg_version}.gem" => ["Rakefile",
 end
 
 
-file "lib/sqlanywhere.so" => ["ext/sqlanywhere.so"] do
+file File.join("lib", library_file) => [File.join("ext", library_file)] do
    # If the hint file exists, delete it
    File.unlink(File.join("lib", "sqlanywhere.rb")) if File.exists?(File.join("lib", "sqlanywhere.rb"))
-   File.copy(File.join("ext", "sqlanywhere.so"), "lib")
+   File.copy(File.join("ext", library_file), "lib")
 end
 
-file "ext/sqlanywhere.so" => ["ext/sqlanywhere.c"] do
+file File.join("ext", library_file) => ["ext/sqlanywhere.c"] do
    sh "cd ext && ruby extconf.rb"
    sh "cd ext && #{MAKE}"
    sh "cd ext && mt -outputresource:sqlanywhere.so;2 -manifest sqlanywhere.so.manifest" if APPLY_MANIFEST
@@ -204,4 +206,4 @@ task :publish_rdoc => ["html/index.html"] do
   system "pscp -r html/* efarrar@rubyforge.org:/var/www/gforge-projects/sqlanywhere/sqlanywhere"
 end
 
-CLOBBER.include("sqlanywhere-#{pkg_version}-#{spec.platform}.gem", "sqlanywhere-#{pkg_version}.gem", "lib/*", "ext/*.obj", "ext/*.def", "ext/*.so", "ext/*.log", "ext/*.exp", "ext/*.lib", "ext/*.pdb", "ext/Makefile", "ext/*.so.manifest", "ext/*.o", "build/**/*", "build")
+CLOBBER.include("sqlanywhere-#{pkg_version}-#{spec.platform}.gem", "sqlanywhere-#{pkg_version}.gem", "lib/*", "ext/*.obj", "ext/*.def", "ext/*.so", "ext/*.bundle", "ext/*.log", "ext/*.exp", "ext/*.lib", "ext/*.pdb", "ext/Makefile", "ext/*.so.manifest", "ext/*.o", "build/**/*", "build")

data/ext/extconf.rb

@@ -1,6 +1,6 @@
 #====================================================
 #
-#    Copyright 2008 iAnywhere Solutions, Inc.
+#    Copyright 2008-2009 iAnywhere Solutions, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/ext/sacapi.h

@@ -1,6 +1,6 @@
 /* ====================================================
  * 
- *       Copyright 2008 iAnywhere Solutions, Inc.
+ *       Copyright 2008-2009 iAnywhere Solutions, Inc.
  * 
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
  * such as PHP, Perl, Python, Ruby, and others. This API layer sits on top of DBLIB and was implemented
  * using Embedded SQL. This API is not a replacement of DBLIB. It is just a way to simplify creating applications
  * from C/C++ code without having to learn all the details of Embedded SQL.
- * For more information on the implementation, please refer to the file sqlany_imp.sqc.
  *
  * \section distribution Distribution of the API
  * The API is built as a DLL (shared object on UNIX). The name of the DLL is \b dbcapi.dll 

data/ext/sacapidll.c

@@ -1,6 +1,6 @@
 //====================================================
 //
-//      Copyright 2008 iAnywhere Solutions, Inc.
+//      Copyright 2008-2009 iAnywhere Solutions, Inc.
 //
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -30,13 +30,18 @@
 #else
     #include <dlfcn.h>
     /* assume we are running on a UNIX platform */
+    #if defined( __APPLE__ )
+	#define LIB_EXT "dylib"
+    #else
+	#define LIB_EXT "so"
+    #endif
     #if defined( _REENTRANT ) || defined( _THREAD_SAFE ) \
 	|| defined( __USE_REENTRANT )
     /* if building a thread-safe library, we need to load 
        the thread-safe dbcapi library */
-	#define DEFAULT_LIBRARY_NAME "libdbcapi_r.so"
+	#define DEFAULT_LIBRARY_NAME "libdbcapi_r." LIB_EXT
     #else
-	#define DEFAULT_LIBRARY_NAME "libdbcapi.so"
+	#define DEFAULT_LIBRARY_NAME "libdbcapi." LIB_EXT
     #endif
 #endif
 

data/ext/sacapidll.h

@@ -1,6 +1,6 @@
 /* ====================================================
  * 
- *       Copyright 2008 iAnywhere Solutions, Inc.
+ *       Copyright 2008-2009 iAnywhere Solutions, Inc.
  * 
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.

data/ext/sqlanywhere.c

@@ -1,6 +1,6 @@
 /*====================================================
 *
-*   Copyright 2008 iAnywhere Solutions, Inc.
+*   Copyright 2008-2009 iAnywhere Solutions, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 #include "ruby.h"
 #include "sacapidll.h"
 
-const char* VERSION = "0.1.1";
+const char* VERSION = "0.1.2";
 
 // Defining the Ruby Modules
 static VALUE mSQLAnywhere;
@@ -59,6 +59,12 @@ static_SQLAnywhereInterface_sqlany_init(VALUE class);
 static VALUE
 static_SQLAnywhereInterface_sqlany_new_connection(VALUE class);
 
+static VALUE
+static_SQLAnywhereInterface_sqlany_client_version(VALUE api);
+
+static VALUE
+static_SQLAnywhereInterface_sqlany_connect(VALUE api, VALUE sqlany_conn, VALUE str);
+
 static VALUE
 static_SQLAnywhereInterface_sqlany_disconnect(VALUE api, VALUE sqlany_conn);
 
@@ -119,8 +125,15 @@ static_SQLAnywhereInterface_sqlany_describe_bind_param(VALUE api, VALUE sqlany_s
 static VALUE C2RB(a_sqlany_data_value* value)
 {
    VALUE tdata;
-
-    switch( value->type ) {
+   
+   if( value == NULL || value->buffer == NULL || value->is_null == NULL ) {
+      rb_raise(rb_eTypeError, "Operation not allowed. Has no value.");
+   }
+   else if ( *value->is_null ) {
+      tdata = Qnil;
+   }
+   else {
+      switch( value->type ) {
 	case A_BINARY:
 	    tdata = rb_str_new(value->buffer, *value->length);
 	    break;
@@ -158,6 +171,7 @@ static VALUE C2RB(a_sqlany_data_value* value)
 	    rb_raise(rb_eTypeError, "Invalid Data Type");
 	    tdata = Qnil;
 	    break;
+      }
     }
 
     return tdata;
@@ -305,6 +319,36 @@ static_SQLAnywhereInterface_sqlany_new_connection(VALUE api)
     return (tdata);
 }
 
+/*
+ * call-seq:
+ *   sqlany_client_version(VALUE api) -> [VALUE verstr]
+ * 
+ *  Retrieves the client version as a string.
+ *
+ *  This function can be used to retrieve the client version. 
+ *  
+ *  <b>Parameters</b>:
+ *  - <tt>VALUE api</tt> --  an initialized API structure to finalize
+ *
+ *  <b>Returns</b>:
+ *  - <tt>VALUE verstr</tt>: The client version string.  
+ *   
+ */
+
+static VALUE
+static_SQLAnywhereInterface_sqlany_client_version(VALUE api)
+{
+    SQLAnywhereInterface* s_api;
+    size_t s_size; 
+    char s_buffer[255];
+
+    Data_Get_Struct(api, SQLAnywhereInterface, s_api);
+
+    s_api->sqlany_client_version(s_buffer, 255);
+
+    return (rb_str_new2(s_buffer));
+}
+
 /*
  * call-seq:
  *   sqlany_connect(VALUE api, VALUE sqlany_conn, VALUE str) -> VALUE result
@@ -1562,14 +1606,7 @@ static_Bind_get_info_output(VALUE bind)
 {
     a_sqlany_bind_param_info* s_bind;
     Data_Get_Struct(bind, a_sqlany_bind_param_info, s_bind);
-
-    if( *s_bind->output_value.is_null ) {
-       return( Qnil );
-    }
-    else
-    {
-       return(C2RB(&s_bind->output_value));
-    }
+    return(C2RB(&s_bind->output_value));
 }
 
 /*
@@ -1597,6 +1634,7 @@ void Init_sqlanywhere()
   // Define all of the DBCAPI functions as methods under an interface instance
   rb_define_method(cSQLAnywhereInterface, "sqlany_init", static_SQLAnywhereInterface_sqlany_init, 0);
   rb_define_method(cSQLAnywhereInterface, "sqlany_new_connection", static_SQLAnywhereInterface_sqlany_new_connection, 0);
+  rb_define_method(cSQLAnywhereInterface, "sqlany_client_version", static_SQLAnywhereInterface_sqlany_client_version, 0);
   rb_define_method(cSQLAnywhereInterface, "sqlany_connect", static_SQLAnywhereInterface_sqlany_connect, 2);
   rb_define_method(cSQLAnywhereInterface, "sqlany_disconnect", static_SQLAnywhereInterface_sqlany_disconnect, 1);
   rb_define_method(cSQLAnywhereInterface, "sqlany_free_connection", static_SQLAnywhereInterface_sqlany_free_connection, 1);

data/test/sqlanywhere_test.rb

@@ -1,6 +1,6 @@
 #====================================================
 #
-#    Copyright 2008 iAnywhere Solutions, Inc.
+#    Copyright 2008-2009 iAnywhere Solutions, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/test/test.sql

@@ -1,8 +1,8 @@
-IF EXISTS( SELECT * FROM "systab" WHERE "table_name" = 'test') THEN
+IF EXISTS( SELECT * FROM "SYS"."SYSTAB" WHERE "table_name" = 'test') THEN
   DROP TABLE "test";
 END IF;
 
-IF EXISTS( SELECT * FROM "systab" WHERE "table_name" = 'types') THEN
+IF EXISTS( SELECT * FROM "SYS"."SYSTAB" WHERE "table_name" = 'types') THEN
   DROP TABLE "types";
 END IF;
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sqlanywhere
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2008-11-07 00:00:00 -05:00
+  version: 0.1.2
+date: 2008-12-18 00:00:00 -05:00
 summary: SQL Anywhere library for Ruby
 require_paths: 
 - lib