teradata-cli 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7a7d94a1cee28f0f0133744e9fa79df82fc8d11
-  data.tar.gz: 8faec4003d79efbe6c84a8bd1ec47f90b3e0c7c2
+  metadata.gz: cbeb4f03192e75727273c03be15c6851fbeff13f
+  data.tar.gz: 12df4d4b28d4ae8a4c1dd2f79f44d95314294006
 SHA512:
-  metadata.gz: 75f1ea62636b79a0e845091d7652e66b461e915393225bba37010f1fadbbfde41d71f266d94eb8bd77356beb86c7216651c08c63c6be1c0116ffa66c3e033ddb
-  data.tar.gz: feefc9306ef18f93486c6d493291c2683995171bc5529494ee4c0e74f21d4c95af240968a819f6d377fb8b59de042f825c2477764c3716cb6deffa1dcf698878
+  metadata.gz: 10990b74d136b6efe3cca3a88df2959c3af15235f80390d5c15d62a17636ded6098d2769b512755d459f31502497ebcdbdd45100041d69cf0bfd7fb07d551b49
+  data.tar.gz: bc0649c40af5e20fb5029c7b2c806c58c107243d81aca892737507025686a93234f48e3dfce98cb80ba536dc8f54134ad3302a28af291bd55a49a4b838b1371a

data/examples/query.rb

@@ -7,7 +7,7 @@
 #    $ ruby example/query.rb 'SELECT * FROM x'
 #
 
-require 'teradata'
+require 'teradata-cli'
 require 'logger'
 require 'pp'
 
@@ -26,7 +26,7 @@ end
 log = Logger.new($stderr)
 log.sev_threshold = $DEBUG ? Logger::DEBUG : Logger::INFO
 
-Teradata.connect(logon_string, :logger => log) {|conn|
+TeradataCli.connect(logon_string, :logger => log) {|conn|
   conn.query(sql) {|result_sets|
     result_sets.each_result_set do |rs|
       pp rs

data/examples/show-queryband.rb

@@ -7,7 +7,7 @@
 #    $ ruby example/show-queryband.rb
 #
 
-require 'teradata'
+require 'teradata-cli'
 
 logon_string = ENV['LOGON_STRING']
 unless logon_string
@@ -15,7 +15,7 @@ unless logon_string
   exit 1
 end
 
-Teradata.connect(logon_string) {|conn|
+TeradataCli.connect(logon_string) {|conn|
   conn.query("SELECT * FROM dbc.sessionInfo") {|rs|
     rs.each do |rec|
       user = rec[:UserName].strip

data/examples/tu/excel/fill.rb

@@ -1,7 +1,7 @@
 require 'excel'
 require 'fileutils'
 require 'pp'
-require 'teradata'
+require 'teradata-cli'
 
 def main
   logon_string, template, output = ARGV
@@ -44,7 +44,7 @@ def fill_sheet(sheet, logon_string)
   y = value_cell.row + 1
 
   # Execute SQL and fill cells by data
-  Teradata.connect(logon_string) {|conn|
+  TeradataCli.connect(logon_string) {|conn|
     conn.query(sql) {|rs|
       rs.each do |rec|
         pp rec

data/examples/tu/tusample1.rb

@@ -1,5 +1,5 @@
-require 'teradata'
-Teradata.connect(ENV['LOGON_STRING']) {|conn|
+require 'teradata-cli'
+TeradataCli.connect(ENV['LOGON_STRING']) {|conn|
   conn.tables("tudemo").
       select {|table| /_bak$/ =~ table.name }.
       each {|table| conn.drop table }

data/examples/tu/tusample2.rb

@@ -1,5 +1,5 @@
-require 'teradata'
-Teradata.connect(ENV['LOGON_STRING']) {|conn|
+require 'teradata-cli'
+TeradataCli.connect(ENV['LOGON_STRING']) {|conn|
   conn.tables("tudemo").
       sort_by {|table| -table.size }.
       first(5).

data/examples/tu/web/bitdao/teradata.rb

@@ -1,8 +1,8 @@
 # $Id: bitdao.rb 184 2009-08-12 08:46:22Z aamine $
 
-require 'teradata'
+require 'teradata-cli'
 
-module Teradata
+module TeradataCli
   class Error
     include ::BitDAO::Error
   end

data/examples/tu/web/bitdao.rb

@@ -56,14 +56,14 @@ class BitDAO
     exec_sql "BEGIN TRANSACTION;"
     begin
       yield
-    rescue Teradata::CLI::UserAbort => err
+    rescue TeradataCli::CLI::UserAbort => err
       aborting = true
       raise err
     ensure
       if $@
         begin
           abort unless aborting
-        rescue Teradata::CLI::UserAbort   # do not override original exception
+        rescue TeradataCli::CLI::UserAbort   # do not override original exception
         end
       else
         exec_sql "END TRANSACTION;"

data/examples/tu/web/server.rb

@@ -9,7 +9,7 @@ $KCODE = 'UTF-8' unless defined?(Encoding)
 $LOAD_PATH.push '.' unless $LOAD_PATH.include?('.')
 
 require 'tdwalker'
-require 'teradata'
+require 'teradata-cli'
 require 'bitweb'
 require 'bitdao'
 require 'bitdao/teradata'
@@ -85,7 +85,7 @@ def request_handler
     TDWalker::Models.new(
       TDWalker::DAO.new(
         log,
-        Teradata.connect(@logon_string)
+        TeradataCli.connect(@logon_string)
       )
     )
   )

data/examples/update.rb

@@ -7,7 +7,7 @@
 #    $ ruby example/update.rb 'CREATE TABLE x (x INTEGER)'
 #
 
-require 'teradata'
+require 'teradata-cli'
 require 'logger'
 require 'pp'
 
@@ -26,6 +26,6 @@ end
 log = Logger.new($stderr)
 log.sev_threshold = $DEBUG ? Logger::DEBUG : Logger::INFO
 
-Teradata.connect(logon_string, :logger => log) {|conn|
+TeradataCli.connect(logon_string, :logger => log) {|conn|
   pp conn.update(sql)
 }

data/ext/{teradata → teradata-cli}/cli/cli.c

@@ -341,7 +341,7 @@ Init_cli(void)
 {
   VALUE Teradata, Teradata_Error;
 
-  Teradata = rb_define_module("Teradata");
+  Teradata = rb_define_module("TeradataCli");
   Teradata_Error = rb_const_get(Teradata, rb_intern("Error"));
 
   CLI = rb_define_class_under(Teradata, "CLI", rb_cObject);

data/ext/{teradata → teradata-cli}/cli/extconf.rb

@@ -4,7 +4,7 @@ def extconf_main
   $objs = %w(cli.o)
   dir_config 'cli'
   if have_library cliv2_libname
-    create_makefile 'teradata/cli'
+    create_makefile 'teradata-cli/cli'
   end
 end
 

data/ext/teradata-cli/cli/mkmf.log

@@ -0,0 +1,57 @@
+have_library: checking for main() in -lcliv2... -------------------- yes
+
+"gcc -o conftest -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/i686-linux -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/ruby/backward -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 -I.  -D_FILE_OFFSET_BITS=64   -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration  -fPIC conftest.c  -L. -L/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -Wl,-R/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -L. -fstack-protector -rdynamic -Wl,-export-dynamic     '-Wl,-rpath,/../lib' -Wl,-R -Wl,/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -L/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -lruby  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+checked program was:
+/* begin */
+1: #include "ruby.h"
+2: 
+3: int main(int argc, char **argv)
+4: {
+5:   return 0;
+6: }
+/* end */
+
+"gcc -o conftest -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/i686-linux -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/ruby/backward -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 -I.  -D_FILE_OFFSET_BITS=64   -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration  -fPIC conftest.c  -L. -L/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -Wl,-R/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -L. -fstack-protector -rdynamic -Wl,-export-dynamic     '-Wl,-rpath,/../lib' -Wl,-R -Wl,/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -L/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -lruby -lcliv2  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+conftest.c: In function ‘t’:
+conftest.c:5:57: error: ‘main’ undeclared (first use in this function)
+conftest.c:5:57: note: each undeclared identifier is reported only once for each function it appears in
+conftest.c:5:32: warning: variable ‘p’ set but not used [-Wunused-but-set-variable]
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int t(void) { void ((*volatile p)()); p = (void ((*)()))main; return 0; }
+ 6: int main(int argc, char **argv)
+ 7: {
+ 8:   if (argc > 1000000) {
+ 9:     printf("%p", &t);
+10:   }
+11: 
+12:   return 0;
+13: }
+/* end */
+
+"gcc -o conftest -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/i686-linux -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0/ruby/backward -I/home/jc34/.rvm/rubies/ruby-2.0.0-p247/include/ruby-2.0.0 -I.  -D_FILE_OFFSET_BITS=64   -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration  -fPIC conftest.c  -L. -L/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -Wl,-R/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -L. -fstack-protector -rdynamic -Wl,-export-dynamic     '-Wl,-rpath,/../lib' -Wl,-R -Wl,/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -L/home/jc34/.rvm/rubies/ruby-2.0.0-p247/lib -lruby -lcliv2  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+conftest.c: In function ‘t’:
+conftest.c:5:1: warning: implicit declaration of function ‘main’ [-Wimplicit-function-declaration]
+checked program was:
+/* begin */
+ 1: #include "ruby.h"
+ 2: 
+ 3: /*top*/
+ 4: extern int t(void);
+ 5: int t(void) { main(); return 0; }
+ 6: int main(int argc, char **argv)
+ 7: {
+ 8:   if (argc > 1000000) {
+ 9:     printf("%p", &t);
+10:   }
+11: 
+12:   return 0;
+13: }
+/* end */
+
+--------------------
+

data/lib/teradata-cli/cli.rb

@@ -0,0 +1,4 @@
+# cli.so requires Teradata::Error, load teradata/exception first.
+require "teradata-cli/version"
+require 'teradata-cli/exception'
+require 'teradata-cli/cli.so'

data/lib/{teradata → teradata-cli}/connection.rb

@@ -8,13 +8,13 @@
 # the GNU LGPL2, Lesser General Public License version 2.
 #
 
-require 'teradata/cli'
-require 'teradata/utils'
-require 'teradata/exception'
+require 'teradata-cli/cli'
+require 'teradata-cli/utils'
+require 'teradata-cli/exception'
 require 'forwardable'
 require 'stringio'
 
-module Teradata
+module TeradataCli
 
   class ConnectionError < CLIError; end
   class MetaDataFormatError < CLIError; end
@@ -32,7 +32,7 @@ module Teradata
 
   class UserAbort < SQLError; end
 
-  def Teradata.connect(*args, &block)
+  def TeradataCli.connect(*args, &block)
     Connection.open(*args, &block)
   end
 
@@ -43,15 +43,15 @@ module Teradata
     end
 
     def Connection.default_session_charset
-      Teradata::SessionCharset.new('UTF8')
+      TeradataCli::SessionCharset.new('UTF8')
     end
 
     def initialize(logon_string, options = {})
       session_charset = options[:session_charset] || Connection.default_session_charset
       internal_encoding = options[:internal_encoding] || default_internal_encoding()
       @logger = options[:logger] || NullLogger.new
-      @logon_string = Teradata::LogonString.intern(logon_string)
-      @session_charset = Teradata::SessionCharset.intern(session_charset)
+      @logon_string = TeradataCli::LogonString.intern(logon_string)
+      @session_charset = TeradataCli::SessionCharset.intern(session_charset)
       @external_encoding = @session_charset.encoding
       @internal_encoding = internal_encoding
       ex = StringExtractor.get(@external_encoding, @internal_encoding)
@@ -265,7 +265,7 @@ module Teradata
     end
 
     def id_string
-      "Teradata::Connection:#{'%x' % object_id}"
+      "TeradataCli::Connection:#{'%x' % object_id}"
     end
   end
 
@@ -400,11 +400,11 @@ module Teradata
     private
 
     def warn(&block)
-      @logger.warn { "Teradata::CLI:#{'%x' % object_id}: #{yield}" }
+      @logger.warn { "TeradataCli::CLI:#{'%x' % object_id}: #{yield}" }
     end
 
     def debug(&block)
-      @logger.debug { "Teradata::CLI:#{'%x' % object_id}: #{yield}" }
+      @logger.debug { "TeradataCli::CLI:#{'%x' % object_id}: #{yield}" }
     end
 
   end

data/lib/{teradata → teradata-cli}/dbobject.rb

@@ -8,11 +8,11 @@
 # the GNU LGPL2, Lesser General Public License version 2.
 #
 
-require 'teradata/utils'
-require 'teradata/connection'
-require 'teradata/exception'
+require 'teradata-cli/utils'
+require 'teradata-cli/connection'
+require 'teradata-cli/exception'
 
-module Teradata
+module TeradataCli
 
   class ObjectError < Error; end
 
@@ -161,7 +161,7 @@ module Teradata
         WHERE databaseName = #{sql_string database}
         GROUP BY tableName
       EndSQL
-      c = ::Teradata::Table
+      c = ::TeradataCli::Table
       recs.map {|rec|
         name, curr, peak = *rec.to_a
         c.new(database, name, curr.to_i, peak.to_i)
@@ -169,7 +169,7 @@ module Teradata
     end
 
     def views(database)
-      fetch_objects(database, ::Teradata::View)
+      fetch_objects(database, ::TeradataCli::View)
     end
 
     def fetch_objects(database, obj_class)
@@ -182,7 +182,7 @@ module Teradata
 
     def objects(database)
       entries("HELP DATABASE #{database}").map {|rec|
-        ::Teradata::DBObject.create(rec[1].strip, database, rec[0].strip)
+        ::TeradataCli::DBObject.create(rec[1].strip, database, rec[0].strip)
       }
     end
 

data/lib/{teradata → teradata-cli}/exception.rb

@@ -8,7 +8,7 @@
 # the GNU LGPL2, Lesser General Public License version 2.
 #
 
-module Teradata
+module TeradataCli
 
   class Error < StandardError; end
 

data/lib/{teradata → teradata-cli}/utils.rb

@@ -8,9 +8,9 @@
 # the GNU LGPL2, Lesser General Public License version 2.
 #
 
-require 'teradata/exception'
+require 'teradata-cli/exception'
 
-module Teradata
+module TeradataCli
 
   class BadLogonString < Error; end
 

data/lib/teradata-cli/version.rb

@@ -0,0 +1,3 @@
+module TeradataCli
+  VERSION = "0.0.3"
+end

data/lib/teradata-cli.rb

@@ -0,0 +1,14 @@
+#
+# $Id: teradata-cli.rb 7 2010-03-04 16:54:09Z tdaoki $
+#
+# Copyright (C) 2009,2010 teradata Japan, LTD.
+#
+# This program is free software.
+# You can distribute/modify this program under the terms of
+# the GNU LGPL2, Lesser General Public License version 2.
+#
+
+require 'teradata-cli/connection'
+require 'teradata-cli/dbobject'
+require 'teradata-cli/utils'
+require 'teradata-cli/exception'

data/teradata-cli.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'teradata/cli/version'
+require 'teradata-cli/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "teradata-cli"
-  spec.version       = Teradata::Cli::VERSION
+  spec.version       = TeradataCli::VERSION
   spec.authors       = ["Giuseppe Privitera"]
   spec.email         = ["priviterag@gmail.com"]
   spec.description   = %q{ruby extension for Teradata Cliv2}
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.extensions    = ["ext/teradata/cli/extconf.rb"]
+  spec.extensions    = ["ext/teradata-cli/cli/extconf.rb"]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/test/rubyclitestutils.rb

@@ -2,7 +2,7 @@ module RubyCLITestUtils
 
   def logon_string
     s = ENV['TEST_LOGON_STRING'] or raise ArgumentError, "environ TEST_LOGON_STRING not given"
-    Teradata::LogonString.parse(s)
+    TeradataCli::LogonString.parse(s)
   end
 
   def playpen_string
@@ -26,7 +26,7 @@ module RubyCLITestUtils
       options[:session_charset] = charset if charset
       options[:internal_encoding] = internal if internal
     end
-    Teradata::Connection.open(logon_string, options) {|conn|
+    TeradataCli::Connection.open(logon_string, options) {|conn|
       begin
         @conn = conn
         yield conn
@@ -72,7 +72,7 @@ module RubyCLITestUtils
 
   def drop_table_force(name, conn = @conn)
     drop_table name, conn
-  rescue Teradata::SQLError => err
+  rescue TeradataCli::SQLError => err
     raise err unless err.code == ERR_OBJECT_NOT_EXIST
   end
 

data/test/test_connection.rb

@@ -1,4 +1,4 @@
-require 'teradata'
+require 'teradata-cli'
 require 'test/unit'
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
@@ -10,8 +10,8 @@ class Test_Connection < Test::Unit::TestCase
 
   def test_s_open
     begin
-      conn = Teradata::Connection.open(logon_string)
-      assert_instance_of Teradata::Connection, conn
+      conn = TeradataCli::Connection.open(logon_string)
+      assert_instance_of TeradataCli::Connection, conn
       assert_equal false, conn.closed?
     ensure
       begin
@@ -21,7 +21,7 @@ class Test_Connection < Test::Unit::TestCase
       assert_equal true, conn.closed?
     end
 
-    Teradata::Connection.open(logon_string) {|c| assert_instance_of(Teradata::Connection, c); assert_equal(false, c.closed?)}
+    TeradataCli::Connection.open(logon_string) {|c| assert_instance_of(TeradataCli::Connection, c); assert_equal(false, c.closed?)}
     assert_equal true, conn.closed?
   end
 
@@ -29,7 +29,7 @@ class Test_Connection < Test::Unit::TestCase
     connect {
       drop_table_force "#{get_table_name('t')}"
       x = @conn.execute_update("CREATE TABLE #{get_table_name('t')} (x INTEGER);")
-      assert_instance_of Teradata::ResultSet, x
+      assert_instance_of TeradataCli::ResultSet, x
       assert_equal true, x.closed?
     }
   end
@@ -47,7 +47,7 @@ class Test_Connection < Test::Unit::TestCase
         @conn.execute_update "BEGIN TRANSACTION;"
         @conn.execute_update "DELETE FROM #{name};"
         @conn.execute_update "ABORT;"
-      rescue Teradata::UserAbort
+      rescue TeradataCli::UserAbort
       end
       recs = @conn.entries("SELECT * FROM #{name} ORDER BY 1;")
       assert_equal 2, recs.size
@@ -66,19 +66,19 @@ class Test_Connection < Test::Unit::TestCase
   def _test_single_rs(name, conn)
     buf = []
     conn.execute_query("SELECT * FROM #{name} ORDER BY 1") {|rs|
-      assert_instance_of Teradata::ResultSet, rs
+      assert_instance_of TeradataCli::ResultSet, rs
       rs.each do |rec|
         buf.push rec
       end
     }
     assert_equal 3, buf.size
-    assert_instance_of Teradata::Record, buf[0]
+    assert_instance_of TeradataCli::Record, buf[0]
     assert_equal 1, buf[0][:x]
     assert_equal 2, buf[0][:y]
-    assert_instance_of Teradata::Record, buf[1]
+    assert_instance_of TeradataCli::Record, buf[1]
     assert_equal 3, buf[1][:x]
     assert_equal 4, buf[1][:y]
-    assert_instance_of Teradata::Record, buf[2]
+    assert_instance_of TeradataCli::Record, buf[2]
     assert_equal 5, buf[2][:x]
     assert_equal 6, buf[2][:y]
   end
@@ -87,10 +87,10 @@ class Test_Connection < Test::Unit::TestCase
     buf = []
     num_rs = 0
     conn.execute_query("SELECT * FROM #{name} ORDER BY 1") {|sets|
-      assert_instance_of Teradata::ResultSet, sets
+      assert_instance_of TeradataCli::ResultSet, sets
       sets.each_result_set do |rs|
         num_rs += 1
-        assert_instance_of Teradata::ResultSet, rs
+        assert_instance_of TeradataCli::ResultSet, rs
         rs.each do |rec|
           buf.push rec
         end
@@ -99,7 +99,7 @@ class Test_Connection < Test::Unit::TestCase
     assert_equal 1, num_rs
     assert_equal 3, buf.size
     buf.each do |r|
-      assert_instance_of Teradata::Record, r
+      assert_instance_of TeradataCli::Record, r
     end
     assert_equal [1,2], [buf[0][:x], buf[0][:y]]
     assert_equal [3,4], [buf[1][:x], buf[1][:y]]
@@ -112,10 +112,10 @@ class Test_Connection < Test::Unit::TestCase
     conn.execute_query(
       "SELECT * FROM #{name} ORDER BY 1;
          SELECT * FROM #{name} ORDER BY 1 DESC;") {|sets|
-      assert_instance_of Teradata::ResultSet, sets
+      assert_instance_of TeradataCli::ResultSet, sets
       sets.each_result_set do |rs|
         num_rs += 1
-        assert_instance_of Teradata::ResultSet, rs
+        assert_instance_of TeradataCli::ResultSet, rs
         rs.each do |rec|
           buf.push rec
         end
@@ -124,7 +124,7 @@ class Test_Connection < Test::Unit::TestCase
     assert_equal 2, num_rs
     assert_equal 6, buf.size
     buf.each do |r|
-      assert_instance_of Teradata::Record, r
+      assert_instance_of TeradataCli::Record, r
     end
     assert_equal [1,2], [buf[0][:x], buf[0][:y]]
     assert_equal [3,4], [buf[1][:x], buf[1][:y]]
@@ -198,8 +198,8 @@ class Test_Connection < Test::Unit::TestCase
       using_test_table(get_table_name('t1')) {
         using_test_table(get_table_name('t2')) {
         list = @conn.tables(db)
-        assert(list.include? Teradata::Table.new(db, 't1'))
-        assert(list.include? Teradata::Table.new(db, 't2'))
+        assert(list.include? TeradataCli::Table.new(db, 't1'))
+        assert(list.include? TeradataCli::Table.new(db, 't2'))
       }}
     }
   end
@@ -208,7 +208,7 @@ class Test_Connection < Test::Unit::TestCase
     db = playpen_string
     using_test_table do
       using_view("#{get_table_name('v')}", 'select 1 as i') do
-        assert(@conn.views(db).include? Teradata::View.new(db, 'v'))
+        assert(@conn.views(db).include? TeradataCli::View.new(db, 'v'))
       end
     end
   end
@@ -220,8 +220,8 @@ class Test_Connection < Test::Unit::TestCase
       using_test_table(get_table_name('t')) do
         using_view("#{get_table_name('v')}", 'select 1 as i') do
           objects = @conn.objects(db)
-          assert(objects.include? Teradata::Table.new(db, 't'))
-          assert(objects.include? Teradata::View.new(db, 'v'))
+          assert(objects.include? TeradataCli::Table.new(db, 't'))
+          assert(objects.include? TeradataCli::View.new(db, 'v'))
         end
       end
     end
@@ -239,13 +239,13 @@ class Test_Connection < Test::Unit::TestCase
 
   def drop_view_force(name, conn = @conn)
     conn.execute_update "DROP VIEW #{name}"
-  rescue Teradata::SQLError
+  rescue TeradataCli::SQLError
   end
 
   def test_info
     connect {
       info = @conn.info
-      assert_instance_of Teradata::SessionInfo, info
+      assert_instance_of TeradataCli::SessionInfo, info
       assert_equal logon_string.user.downcase, info.user_name.downcase
     }
   end
@@ -253,8 +253,8 @@ class Test_Connection < Test::Unit::TestCase
   def test_column
     db = playpen_string
     using_table("#{get_table_name('t')}", "x INTEGER, y INTEGER") do
-      col = @conn.column(Teradata::Table.new(db, 't'), 'x')
-      assert_instance_of Teradata::Column, col
+      col = @conn.column(TeradataCli::Table.new(db, 't'), 'x')
+      assert_instance_of TeradataCli::Column, col
       assert_equal 'x', col.column_name.strip.downcase
     end
   end
@@ -274,7 +274,7 @@ class Test_Connection < Test::Unit::TestCase
         assert_equal n_records, count(table, conn)
 
         # transaction fails #2
-        assert_raise(Teradata::UserAbort) {
+        assert_raise(TeradataCli::UserAbort) {
           conn.transaction {
           conn.query "DELETE FROM #{table}"
           conn.abort

data/test/test_dbobject.rb

@@ -1,4 +1,4 @@
-require 'teradata'
+require 'teradata-cli'
 require 'test/unit'
 libdir = File.dirname(__FILE__) 
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
@@ -9,99 +9,99 @@ class Test_Teradata_DBObject < Test::Unit::TestCase
   include RubyCLITestUtils
 
   def test_s_intern_string
-    t = Teradata::Table.intern('db.tab')
-    assert_instance_of Teradata::Table, t
+    t = TeradataCli::Table.intern('db.tab')
+    assert_instance_of TeradataCli::Table, t
     assert_equal 'db.tab', t.name
   end
 
   def test_s_intern_class
-    t0 = Teradata::Table.new('db', 'tab')
-    t = Teradata::Table.intern(t0)
-    assert_instance_of Teradata::Table, t
+    t0 = TeradataCli::Table.new('db', 'tab')
+    t = TeradataCli::Table.intern(t0)
+    assert_instance_of TeradataCli::Table, t
     assert_equal t0, t
     assert_equal 'db.tab', t.name
   end
 
   def test_names_qualified
-    t = Teradata::Table.new('bwtest', 'tab')
+    t = TeradataCli::Table.new('bwtest', 'tab')
     assert_equal 'bwtest', t.database
     assert_equal 'bwtest.tab', t.name
     assert_equal 'tab', t.unqualified_name
   end
 
   def test_names_unqualified
-    t = Teradata::Table.new('tab')
+    t = TeradataCli::Table.new('tab')
     assert_nil t.database
     assert_equal 'tab', t.name
     assert_equal 'tab', t.unqualified_name
   end
 
   def test_to_s
-    assert_equal 'db.tab', Teradata::Table.new('db', 'tab').to_s
-    assert_equal 'bwtest.tab', Teradata::Table.new('bwtest', 'tab').to_s
-    assert_equal 'tab', Teradata::Table.new('tab').to_s
+    assert_equal 'db.tab', TeradataCli::Table.new('db', 'tab').to_s
+    assert_equal 'bwtest.tab', TeradataCli::Table.new('bwtest', 'tab').to_s
+    assert_equal 'tab', TeradataCli::Table.new('tab').to_s
   end
 
   def test_EQ
-    a = Teradata::Table.new('db', 'tab')
-    b = Teradata::Table.new('db', 'tab')
+    a = TeradataCli::Table.new('db', 'tab')
+    b = TeradataCli::Table.new('db', 'tab')
     assert_equal a, a
     assert_equal a, b
     assert_equal b, a
 
     # object name is different
-    c = Teradata::Table.new('db', 'other')
+    c = TeradataCli::Table.new('db', 'other')
     assert_not_equal a, c
     assert_not_equal c, a
 
     # database name is different
-    d = Teradata::Table.new('other', 'tab')
+    d = TeradataCli::Table.new('other', 'tab')
     assert_not_equal a, d
     assert_not_equal d, a
 
     # database name is missing
-    e = Teradata::Table.new('tab')
+    e = TeradataCli::Table.new('tab')
     assert_not_equal a, e
     assert_not_equal e, a
 
     # same name, but different type
-    v = Teradata::View.new('db', 'tab')
+    v = TeradataCli::View.new('db', 'tab')
     assert_not_equal a, v
     assert_not_equal v, a
   end
 
   def test_type_char
-    assert_equal 'T', Teradata::Table.type_char
-    assert_equal 'V', Teradata::View.type_char
-    assert_equal 'M', Teradata::Macro.type_char
-    assert_equal 'N', Teradata::HashIndex.type_char
+    assert_equal 'T', TeradataCli::Table.type_char
+    assert_equal 'V', TeradataCli::View.type_char
+    assert_equal 'M', TeradataCli::Macro.type_char
+    assert_equal 'N', TeradataCli::HashIndex.type_char
   end
 
   def test_type_name
-    assert_equal 'TABLE', Teradata::Table.type_name
-    assert_equal 'VIEW', Teradata::View.type_name
-    assert_equal 'MACRO', Teradata::Macro.type_name
-    assert_equal 'JOIN INDEX', Teradata::JoinIndex.type_name
-    assert_equal 'HASH INDEX', Teradata::HashIndex.type_name
-    assert_equal 'PROCEDURE', Teradata::Procedure.type_name
+    assert_equal 'TABLE', TeradataCli::Table.type_name
+    assert_equal 'VIEW', TeradataCli::View.type_name
+    assert_equal 'MACRO', TeradataCli::Macro.type_name
+    assert_equal 'JOIN INDEX', TeradataCli::JoinIndex.type_name
+    assert_equal 'HASH INDEX', TeradataCli::HashIndex.type_name
+    assert_equal 'PROCEDURE', TeradataCli::Procedure.type_name
   end
 
   def test_table_size
-    t = Teradata::Table.new('db', 'tbl', 17, 39)
+    t = TeradataCli::Table.new('db', 'tbl', 17, 39)
     assert_equal 17, t.size
     assert_equal 17, t.current_perm
     assert_equal 39, t.peak_perm
   end
 
   def test_table_no_peak
-    t = Teradata::Table.new('db', 'tbl', 17)
+    t = TeradataCli::Table.new('db', 'tbl', 17)
     assert_equal 17, t.size
     assert_equal 17, t.current_perm
     assert_nil t.peak_perm
   end
 
   def test_table_size_none
-    t = Teradata::Table.new('db', 'tbl')
+    t = TeradataCli::Table.new('db', 'tbl')
     assert_nil t.size
     assert_nil t.current_perm
     assert_nil t.peak_perm
@@ -110,8 +110,8 @@ class Test_Teradata_DBObject < Test::Unit::TestCase
   def test_root_database
     connect {|conn|
       dbc = conn.root_database
-      assert_kind_of Teradata::Database, dbc
-      assert_instance_of Teradata::User, dbc
+      assert_kind_of TeradataCli::Database, dbc
+      assert_instance_of TeradataCli::User, dbc
       assert_equal 'dbc', dbc.name.downcase
       assert_equal true, dbc.user?
     }
@@ -120,7 +120,7 @@ class Test_Teradata_DBObject < Test::Unit::TestCase
   def test_database
     connect {|conn|
       dbc = conn.database('dbc')
-      assert_instance_of Teradata::User, dbc
+      assert_instance_of TeradataCli::User, dbc
       assert_equal 'dbc', dbc.name.downcase
       assert_equal true, dbc.user?
     }
@@ -134,19 +134,19 @@ class Test_Teradata_DBObject < Test::Unit::TestCase
 
       cs = dbc.children
       assert_equal true, (cs.size > 0)
-      assert_kind_of Teradata::Database, cs.first
-      assert_kind_of Teradata::Database, cs.first.owner
+      assert_kind_of TeradataCli::Database, cs.first
+      assert_kind_of TeradataCli::Database, cs.first.owner
       assert_equal 'dbc', cs.first.owner.name.downcase
 
       sysdba = cs.detect {|c| c.name.downcase == 'sysdba' }
-      assert_instance_of Teradata::User, sysdba
+      assert_instance_of TeradataCli::User, sysdba
       assert_equal true, sysdba.user?
-      assert_instance_of Teradata::User, sysdba.parent
+      assert_instance_of TeradataCli::User, sysdba.parent
 
       syslib = cs.detect {|c| c.name.downcase == 'syslib' }
-      assert_instance_of Teradata::Database, syslib
+      assert_instance_of TeradataCli::Database, syslib
       assert_equal false, syslib.user?
-      assert_instance_of Teradata::User, syslib.parent
+      assert_instance_of TeradataCli::User, syslib.parent
     }
   end
 

data/test/test_record.rb

@@ -1,4 +1,4 @@
-require 'teradata'
+require 'teradata-cli'
 require 'test/unit'
 libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
@@ -55,7 +55,7 @@ class Test_Record < Test::Unit::TestCase
     }
   end
 
-  # TODO Teradata::CLIError: CLI error: [EM_227] MTDP: EM_CHARNAME(227): invalid character set name specified.
+  # TODO TeradataCli::CLIError: CLI error: [EM_227] MTDP: EM_CHARNAME(227): invalid character set name specified.
   #def test_session_charset_EUC
   #  connect('KANJIEUC_0U') {
   #    using_table(get_table_name('strs'), 'c CHAR(1) CHARACTER SET UNICODE, vc VARCHAR(1) CHARACTER SET UNICODE') {|name|
@@ -68,7 +68,7 @@ class Test_Record < Test::Unit::TestCase
   #  }
   #end
 
-  # TODO Teradata::CLIError: CLI error: [EM_227] MTDP: EM_CHARNAME(227): invalid character set name specified.
+  # TODO TeradataCli::CLIError: CLI error: [EM_227] MTDP: EM_CHARNAME(227): invalid character set name specified.
   #def test_session_charset_SJIS
   #  connect('KANJISJIS_0S') {
   #    using_table(get_table_name('strs'), 'c CHAR(1) CHARACTER SET UNICODE, vc VARCHAR(1) CHARACTER SET UNICODE') {|name|
@@ -170,9 +170,9 @@ class Test_Record < Test::Unit::TestCase
         insert name, '1,2,NULL'
         rec = select(name).first
         assert_equal 3, rec.size
-        assert_instance_of Teradata::Field, rec.field(:x)
-        assert_instance_of Teradata::Field, rec.field(:y)
-        assert_instance_of Teradata::Field, rec.field(:z)
+        assert_instance_of TeradataCli::Field, rec.field(:x)
+        assert_instance_of TeradataCli::Field, rec.field(:y)
+        assert_instance_of TeradataCli::Field, rec.field(:z)
         assert_equal 1, rec.field(:x).value
         assert_equal 2, rec.field(:y).value
         assert_equal nil, rec.field(:z).value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teradata-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Giuseppe Privitera
@@ -43,7 +43,7 @@ email:
 - priviterag@gmail.com
 executables: []
 extensions:
-- ext/teradata/cli/extconf.rb
+- ext/teradata-cli/cli/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -68,15 +68,16 @@ files:
 - examples/tu/web/template/footer
 - examples/tu/web/template/header
 - examples/update.rb
-- ext/teradata/cli/cli.c
-- ext/teradata/cli/extconf.rb
-- lib/teradata.rb
-- lib/teradata/cli.rb
-- lib/teradata/cli/version.rb
-- lib/teradata/connection.rb
-- lib/teradata/dbobject.rb
-- lib/teradata/exception.rb
-- lib/teradata/utils.rb
+- ext/teradata-cli/cli/cli.c
+- ext/teradata-cli/cli/extconf.rb
+- ext/teradata-cli/cli/mkmf.log
+- lib/teradata-cli.rb
+- lib/teradata-cli/cli.rb
+- lib/teradata-cli/connection.rb
+- lib/teradata-cli/dbobject.rb
+- lib/teradata-cli/exception.rb
+- lib/teradata-cli/utils.rb
+- lib/teradata-cli/version.rb
 - teradata-cli.gemspec
 - test/all
 - test/rubyclitestutils.rb

data/lib/teradata/cli/version.rb

@@ -1,5 +0,0 @@
-module Teradata
-  module Cli
-    VERSION = "0.0.1"
-  end
-end

data/lib/teradata/cli.rb

@@ -1,4 +0,0 @@
-# cli.so requires Teradata::Error, load teradata/exception first.
-require "teradata/cli/version"
-require 'teradata/exception'
-require 'teradata/cli.so'

data/lib/teradata.rb

@@ -1,14 +0,0 @@
-#
-# $Id: teradata.rb 7 2010-03-04 16:54:09Z tdaoki $
-#
-# Copyright (C) 2009,2010 Teradata Japan, LTD.
-#
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL2, Lesser General Public License version 2.
-#
-
-require 'teradata/connection'
-require 'teradata/dbobject'
-require 'teradata/utils'
-require 'teradata/exception'