transactd 1.1.2-x86-mswin32-100 → 1.2.0-x86-mswin32-100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6200bef5f8ef6f2835167bce4f85f9b2239dba7
-  data.tar.gz: d803b4207ed504b72e99dc7d6b1df02754a8f6a7
+  metadata.gz: e1c19c4cfb8fb4184230e0da0626b44b0fce74b0
+  data.tar.gz: eb2c12e7fd617d322e21c6f3bb122bfd1224f143
 SHA512:
-  metadata.gz: 9a9820b9008a14acc919ca7e328c631b92042eb8fa74c3d5be171cdd0e6b7643d1ff7ae02c1749b8dede28d5477db9b6771db741a33bab07ef1b8e51771e72d1
-  data.tar.gz: a1dda537ce4070246166549f977b59ae4ba6016a698ea08caa45394f32d44ffe5340801dc5a1abd7c3fa90f2c5e54414442bef7494834a7705726e8920cb027f
+  metadata.gz: 08e1277d7d49c3aaa0d1704ed075076401eb55bef634c5b6f24c6c7faa7cc50e73e635b40b71b68e43f212a226320bd339bb3fe199101afa0fa45b50a7e8c88c
+  data.tar.gz: 28daaeda8fffb3e94c901dfc1852c2d539487d67d5c48a1dc6b24963f94202e8bc7e6c3861cc695ea9ddc377c63946feed75347c74a048ff3d9d6c20041410b2

data/CMakeLists.txt

@@ -29,16 +29,28 @@ include(build/common/transactd_common.cmake)
 option(WITH_TRANSACTD_SERVER    "Build Transactd server plugin"                   ON)
 option(WITH_TRANSACTD_CLIENTS   "Build Transactd client libraries"                ON)
 option(TRANSACTD_HANDLERSOCKET  "Add HandlerSocket protocol to Transactd plugin"  ON)
-option(TRANSACTD_RUBY_GEM       "Build Transactd ruby gem"                        OFF)
 set(TRANSACTD_PREFIX  "/usr/local/transactd"  CACHE STRING "Prefix for transactd executables(test,benchmark)")
 set(TRANSACTD_CLIENTS_PREFIX    ""            CACHE STRING "Prefix for transactd client libraries")
+  # options for Ruby client
+option(TRANSACTD_RUBY_GEM       "Build Transactd ruby gem"                        OFF)
+  # options for PHP client
+option(TRANSACTD_PHP            "Build Transactd client PHP extension"            OFF)
+set(TRANSACTD_PHP_SOURCE_ROOT   "" CACHE STRING "Path of php source directory")
+set(TRANSACTD_PHP_LIBRARY_PATH  "" CACHE STRING "Library path for php")
+option(TRANSACTD_PHP_ZTS        "Add ZTS flag for build Transactd client PHP extension" OFF)
 
 #   The following options are set automatically if not specified.
 #   Usually you do not have to set these values.
+  # options for Ruby client
 set(TRANSACTD_RUBY_GEM_ROOT_PATH    "" CACHE STRING "Transactd gem root path")
 set(TRANSACTD_RUBY_EXECUTABLE_PATH  "" CACHE STRING "Ruby executable path")
-set(TRANSACTD_RUBY_INCLUDE_PATH     "" CACHE STRING "Include path for ruby-swig")
-set(TRANSACTD_RUBY_LIBRARY_PATH     "" CACHE STRING "Include path for ruby")
+set(TRANSACTD_RUBY_INCLUDE_PATH     "" CACHE STRING "Include path for ruby")
+set(TRANSACTD_RUBY_LIBRARY_PATH     "" CACHE STRING "Library path for ruby")
+  # options for PHP client
+set(TRANSACTD_PHP_INCLUDE_PATH      "" CACHE STRING "Include path for PHP")
+option(TRANSACTD_PHP_USE_32BIT_TIME_T 
+  "Add _USE_32BIT_TIME_T option for building Transactd client PHP extension"      ON)
+set(TDCL_CPP_CHARSET  "" CACHE STRING "Transactd clients charset m:Multibyte u:Unicode")
 
 
 # ==========================================================
@@ -50,6 +62,10 @@ if(TRANSACTD_RUBY_GEM)
   set(WITH_TRANSACTD_SERVER   OFF)
   set(WITH_TRANSACTD_CLIENTS  OFF)
 endif()
+if(TRANSACTD_PHP)
+  set(WITH_TRANSACTD_SERVER   OFF)
+  set(WITH_TRANSACTD_CLIENTS  OFF)
+endif()
 
 
 # ==========================================================
@@ -71,7 +87,9 @@ if(WITH_TRANSACTD_CLIENTS)
   endif()
   subdirs("build/tdclc")
   if(WIN32 AND NOT MINGW)
-    set(TDCL_CPP_CHARSET u)
+    if((NOT ("${TDCL_CPP_CHARSET}" STREQUAL "m")) AND (NOT ("${TDCL_CPP_CHARSET}" STREQUAL "u")))
+      set(TDCL_CPP_CHARSET u)
+    endif()
   else()
     set(TDCL_CPP_CHARSET m)
   endif()
@@ -91,6 +109,21 @@ if(TRANSACTD_RUBY_GEM)
   if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
     project(tdcl)
   endif()
+  set(TDCL_CPP_CHARSET m)
   transactd_copy_subdir("${TRANSACTD_ROOT}" tdclcpp tdclcppm)
   subdirs("build/tdclrb")
 endif()
+
+
+# ==========================================================
+# build PHP extension
+# ==========================================================
+if(TRANSACTD_PHP)
+  message(STATUS "BUILD Transactd client PHP extension")
+  if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+    project(tdcl)
+  endif()
+  set(TDCL_CPP_CHARSET m)
+  transactd_copy_subdir("${TRANSACTD_ROOT}" tdclcpp tdclcppm)
+  subdirs("build/tdclphp")
+endif()

data/source/bzs/test/tdclrb/transactd_blob_spec.rb

@@ -0,0 +1,332 @@
+# coding : utf-8
+=begin ============================================================
+   Copyright (C) 2013 BizStation Corp All rights reserved.
+
+   This program is free software you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation either version 2
+   of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program if not, write to the Free Software 
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   02111-1307, USA.
+===================================================================
+=end
+require 'transactd'
+require 'base64'
+
+def getHost()
+  hostname = '127.0.0.1/'
+  if (ENV['TRANSACTD_RSPEC_HOST'] != nil && ENV['TRANSACTD_RSPEC_HOST'] != '')
+    hostname = ENV['TRANSACTD_RSPEC_HOST']
+  end
+  hostname = hostname + '/' unless (hostname =~ /\/$/)
+  return hostname
+end
+
+HOSTNAME = getHost()
+URL = 'tdap://' + HOSTNAME + 'test_blob?dbfile=test.bdf'
+TABLENAME = 'comments'
+FDI_ID = 0
+FDI_USER_ID = 1
+FDI_BODY = 2
+FDI_IMAGE = 3
+
+TYPE_SCHEMA_BDF = 0
+
+def dropDatabase(db)
+  db.open(URL)
+  expect(db.stat()).to eq 0
+  db.drop()
+  expect(db.stat()).to eq 0
+end
+
+def createDatabase(db)
+  db.create(URL)
+  if db.stat() == Transactd::STATUS_TABLE_EXISTS_ERROR
+    dropDatabase(db)
+    db.create(URL)
+  end
+  expect(db.stat()).to eq 0
+end
+
+def openDatabase(db)
+  db.open(URL, TYPE_SCHEMA_BDF, Transactd::TD_OPEN_NORMAL)
+  expect(db.stat()).to eq 0
+end
+
+def createTable(db)
+  openDatabase(db)
+  dbdef = db.dbDef()
+  expect(dbdef).not_to be nil
+  td = Transactd::Tabledef.new()
+  # Set table schema codepage to UTF-8
+  #   - codepage for field NAME and tableNAME
+  td.schemaCodePage = Transactd::CP_UTF8
+  td.setTableName(TABLENAME)
+  td.setFileName(TABLENAME + '.dat')
+  # Set table default charaset index
+  #    - default charset for field VALUE
+  td.charsetIndex = Transactd::charsetIndex(Transactd::CP_UTF8)
+  td.id = 1
+  td.pageSize = 2048
+  dbdef.insertTable(td)
+  expect(dbdef.stat()).to eq 0
+  # id
+  fd = dbdef.insertField(1, FDI_ID)
+  fd.setName('id')
+  fd.type = Transactd::Ft_autoinc
+  fd.len = 4
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+  # user_id
+  fd = dbdef.insertField(1, FDI_USER_ID)
+  fd.setName('user_id')
+  fd.type = Transactd::Ft_integer
+  fd.len = 4
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+  # body
+  fd = dbdef.insertField(1, FDI_BODY)
+  fd.setName('body')
+  fd.type = Transactd::Ft_mytext
+  fd.len = 10 # 9:TYNYTEXT 10:TEXT 11:MIDIUMTEXT 12:LONGTEXT
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+  # image
+  fd = dbdef.insertField(1, FDI_IMAGE)
+  fd.setName('image')
+  fd.type = Transactd::Ft_myblob
+  fd.len = 10 # 9:TYNYBLOB 10:BLOB 11:MIDIUMBLOB 12:LONGBLOB
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+  # key
+  kd = dbdef.insertKey(1,0)
+  kd.segment(0).fieldNum = 0
+  kd.segment(0).flags.bit8 = 1
+  kd.segment(0).flags.bit1 = 1
+  kd.segmentCount = 1
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+end
+
+def openTable(db)
+  tb = db.openTable(TABLENAME)
+  expect(db.stat()).to eq 0
+  return tb
+end
+
+def getTestBinary()
+  image_base64 = 'R0lGODdhEAAQAKEBAGZmZv#/5mZmczMzCwAAAAAEAAQAAACRowzIgA6BxebTMAgG60nW5NM1kAZikGFHAmgYvYgJpW12FfTyLpJjz+IVSSXR4IlQCoUgCCG8ds0D5xZT3TJYS8IZiMJKQAAOw=='
+  return Base64.decode64(image_base64)
+end
+
+describe Transactd, 'blob' do
+  before :each do
+    @db = Transactd::Database.createObject()
+  end
+  after :each do
+    @db.close()
+    @db = nil
+  end
+  
+  it 'create' do
+    createDatabase(@db)
+    openDatabase(@db)
+    createTable(@db)
+    tb = openTable(@db)
+    tb.close()
+  end
+  
+  it 'insert' do
+    image = getTestBinary()
+    openDatabase(@db)
+    tb = openTable(@db)
+    expect(tb).not_to be nil
+    # 1
+    tb.clearBuffer()
+    tb.setFV(FDI_USER_ID, 1)
+    tb.setFV(FDI_BODY, "1\ntest\nテスト\n\nあいうえおあいうえお")
+    tb.setFV(FDI_IMAGE, image, image.bytesize)
+    tb.insert()
+    expect(tb.stat()).to eq 0
+    # 2
+    tb.clearBuffer()
+    tb.setFV('user_id', 1)
+    tb.setFV('body', "2\ntest\nテスト\n\nあいうえおあいうえお")
+    str = "2\ntest\nテスト\n\nあいうえおあいうえお"
+    tb.setFV('image', str, str.bytesize)
+    tb.insert()
+    expect(tb.stat()).to eq 0
+    # 3
+    tb.clearBuffer()
+    tb.setFV(FDI_USER_ID, 2)
+    tb.setFV(FDI_BODY, "3\ntest\nテスト\n\nあいうえおあいうえお")
+    str = "3\ntest\nテスト\n\nあいうえおあいうえお"
+    tb.setFV(FDI_IMAGE, str, str.bytesize)
+    tb.insert()
+    expect(tb.stat()).to eq 0
+    tb.close()
+  end
+  
+  it 'seek' do
+    image = getTestBinary()
+    openDatabase(@db)
+    tb = openTable(@db)
+    expect(tb).not_to be nil
+    # 1
+    tb.clearBuffer()
+    tb.setFV(FDI_ID, 1)
+    tb.seek()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 1
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "1\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE)).to eq image
+    # 2
+    tb.seekNext()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 2
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    # 3
+    tb.seekNext()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 3
+    expect(tb.getFVint(FDI_USER_ID)).to eq 2
+    expect(tb.getFVstr(FDI_BODY)).to eq "3\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "3\ntest\nテスト\n\nあいうえおあいうえお"
+    # 2
+    tb.seekPrev()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 2
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    tb.close()
+  end
+  
+  it 'find' do
+    image = getTestBinary()
+    openDatabase(@db)
+    tb = openTable(@db)
+    expect(tb).not_to be nil
+    # 1
+    tb.setKeyNum(0)
+    tb.clearBuffer()
+    tb.setFilter('id >= 1 and id < 3', 1, 0)
+    expect(tb.stat()).to eq 0
+    tb.setFV(FDI_ID, 1)
+    tb.find(Transactd::Table::FindForword)
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 1
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "1\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE)).to eq image
+    # 2
+    tb.findNext(true)
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 2
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    # 3... but not found because filtered
+    tb.findNext(true)
+    expect(tb.stat()).to eq Transactd::STATUS_EOF
+    # 2... but changing seek-direction is not allowed
+    tb.findPrev(true)
+    expect(tb.stat()).to eq Transactd::STATUS_PROGRAM_ERROR
+    tb.close()
+  end
+  
+  it 'update' do
+    image = getTestBinary()
+    openDatabase(@db)
+    tb = openTable(@db)
+    expect(tb).not_to be nil
+    # select 1
+    tb.clearBuffer()
+    tb.setFV(FDI_ID, 1)
+    tb.seek()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 1
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "1\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE)).to eq image
+    # update
+    tb.setFV(FDI_BODY, "1\nテスト\ntest\n\nABCDEFG")
+    tb.update()
+    expect(tb.stat()).to eq 0
+    # select 2
+    tb.seekNext()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 2
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    # update
+    tb.setFV(FDI_BODY, "2\nテスト\ntest\n\nABCDEFG")
+    tb.update()
+    expect(tb.stat()).to eq 0
+    # check 1
+    tb.seekPrev()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 1
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "1\nテスト\ntest\n\nABCDEFG"
+    expect(tb.getFVbin(FDI_IMAGE)).to eq image
+    # check 2
+    tb.seekNext()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 2
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "2\nテスト\ntest\n\nABCDEFG"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "2\ntest\nテスト\n\nあいうえおあいうえお"
+    tb.close()
+  end
+  
+  it 'delete' do
+    image = getTestBinary()
+    openDatabase(@db)
+    tb = openTable(@db)
+    expect(tb).not_to be nil
+    # delete 2
+    tb.clearBuffer()
+    tb.setFV(FDI_ID, 2)
+    tb.seek()
+    expect(tb.stat()).to eq 0
+    tb.del()
+    expect(tb.stat()).to eq 0
+    # select 1
+    tb.clearBuffer()
+    tb.setFV(FDI_ID, 1)
+    tb.seek()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 1
+    expect(tb.getFVint(FDI_USER_ID)).to eq 1
+    expect(tb.getFVstr(FDI_BODY)).to eq "1\nテスト\ntest\n\nABCDEFG"
+    expect(tb.getFVbin(FDI_IMAGE)).to eq image
+    # next is 3
+    tb.seekNext()
+    expect(tb.stat()).to eq 0
+    expect(tb.getFVint(FDI_ID)).to eq 3
+    expect(tb.getFVint(FDI_USER_ID)).to eq 2
+    expect(tb.getFVstr(FDI_BODY)).to eq "3\ntest\nテスト\n\nあいうえおあいうえお"
+    expect(tb.getFVbin(FDI_IMAGE).force_encoding('UTF-8')).to eq "3\ntest\nテスト\n\nあいうえおあいうえお"
+    # eof
+    tb.seekNext()
+    expect(tb.stat()).to eq Transactd::STATUS_EOF
+    tb.close()
+  end
+  
+  it 'drop' do
+    dropDatabase(@db)
+  end
+end

data/source/bzs/test/tdclrb/transactd_spec.rb

@@ -100,6 +100,21 @@ def testCreateTable(db)
   fd.len = 33
   dbdef.updateTableDef(1)
   expect(dbdef.stat()).to eq 0
+  
+  fd = dbdef.insertField(1, 2)
+  fd.setName('select')
+  fd.type = Transactd::Ft_integer
+  fd.len = 4
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+  
+  fd = dbdef.insertField(1, 3)
+  fd.setName('in')
+  fd.type = Transactd::Ft_integer
+  fd.len = 4
+  dbdef.updateTableDef(1)
+  expect(dbdef.stat()).to eq 0
+  
   kd = dbdef.insertKey(1,0)
   kd.segment(0).fieldNum = 0
   kd.segment(0).flags.bit8 = 1
@@ -191,6 +206,7 @@ def testFind(db)
     i = i - 1
   end
   # out of filter range (EOF)
+  tb.clearBuffer()
   v = TEST_COUNT
   tb.setFV(FDI_ID, v)
   tb.find(Transactd::Table::FindForword)
@@ -215,6 +231,79 @@ def testFindNext(db)
   tb.close()
 end
 
+def testFindIn(db)
+  tb = testOpenTable(db)
+  tb.setKeyNum(0)
+  tb.clearBuffer()
+  q = Transactd::QueryBase.new()
+  q.addInValue('10', true)
+  q.addInValue('300000')
+  q.addInValue('50')
+  q.addInValue('-1')
+  q.addInValue('80')
+  q.addInValue('5000')
+  
+  tb.setQuery(q)
+  expect(tb.stat()).to eq 0
+  tb.find()
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVint(FDI_ID)).to eq 10
+  tb.findNext()
+  expect(tb.stat()).to eq Transactd::STATUS_NOT_FOUND_TI
+  
+  msg = tb.keyValueDescription()
+  expect(msg).to eq "table:user\nstat:4\nid = 300000\n"
+ 
+  tb.findNext()
+  expect(tb.getFVint(FDI_ID)).to eq 50
+  tb.findNext()
+  expect(tb.stat()).to eq Transactd::STATUS_NOT_FOUND_TI
+  
+  msg = tb.keyValueDescription()
+  expect(msg).to eq "table:user\nstat:4\nid = -1\n"
+ 
+  tb.findNext()
+  expect(tb.getFVint(FDI_ID)).to eq 80
+  tb.findNext()
+  expect(tb.getFVint(FDI_ID)).to eq 5000
+  tb.findNext()
+  expect(tb.stat()).to eq Transactd::STATUS_EOF
+  
+  # Many params
+  q.addInValue('1', true)
+  2.upto(10000) do |i|
+    q.addInValue(i.to_s)
+  end
+  tb.setQuery(q)
+  expect(tb.stat()).to eq 0
+  
+  tb.find()
+  i = 0
+  while tb.stat() == 0 do
+    i = i + 1
+    expect(tb.getFVint(FDI_ID)).to eq i
+    tb.findNext(true)
+  end
+  expect(tb.stat()).to eq Transactd::STATUS_EOF
+  expect(i).to eq 10000
+  
+  # LogicalCountLimit
+  q.select('id')
+  tb.setQuery(q)
+  
+  tb.find()
+  i = 0
+  while tb.stat() == 0 do
+    i = i + 1
+    expect(tb.getFVint(FDI_ID)).to eq i
+    tb.findNext(true)
+  end
+  expect(tb.stat()).to eq Transactd::STATUS_EOF
+  expect(i).to eq 10000
+  
+  tb.close()
+end
+
 def testGetPercentage(db)
   tb = testOpenTable(db)
   tb.clearBuffer()
@@ -448,7 +537,7 @@ def testSnapShot(db)
   if ISOLATION_READ_COMMITTED
     expect(tb2.stat()).to eq 0
   elsif ISOLATION_REPEATABLE_READ
-    expect(tb2.stat()).to eq STATUS_LOCK_ERROR
+    expect(tb2.stat()).to eq Transactd::STATUS_LOCK_ERROR
   end
   # ----------------------------------------------------
   tb.seekFirst()
@@ -1263,6 +1352,7 @@ def testCreateTableStringFilter(db, id, name, type, type2)
 end
 
 def doTestInsertStringFilter(tb)
+  tb.beginBulkInsert(BULKBUFSIZE)
   tb.clearBuffer()
   id = 1
   tb.setFV('id', id)
@@ -1293,6 +1383,7 @@ def doTestInsertStringFilter(tb)
   tb.setFV('name', 'おめでとうございます。')
   tb.setFV('namew', 'おめでとうございます。')
   tb.insert()
+  tb.commitBulkInsert()
 end
 
 def doTestReadStringFilter(tb)
@@ -1325,18 +1416,91 @@ end
 def doTestSetStringFilter(tb)
   tb.setKeyNum(0)
   tb.clearBuffer()
+  
   tb.setFilter("name = 'あい*'", 0, 10)
+  expect(tb.stat()).to eq 0
   tb.seekFirst()
+  expect(tb.stat()).to eq 0
   tb.findNext(false)
   expect(tb.stat()).to eq 0
   expect(tb.getFVstr(FDI_NAME)).to eq 'あいうえおかきくこ'
   expect(tb.recordCount()).to eq 2
+  
   tb.setFilter("name <> 'あい*'", 0, 10)
   expect(tb.recordCount()).to eq 3
+  tb.clearBuffer()
+  tb.seekFirst()
+  expect(tb.stat()).to eq 0
+  tb.findNext(false)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'A123456'
+  
+  tb.findNext()
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'おはようございます'
+  
+  tb.findNext()
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'おめでとうございます。'
+  
+  tb.findNext()
+  expect(tb.stat()).to eq Transactd::STATUS_EOF
+  
+  tb.clearBuffer()
+  tb.seekLast()
+  tb.findPrev(false)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'おめでとうございます。'
+  
+  tb.findPrev()
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'おはようございます'
+  
+  tb.findPrev(false)
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'A123456'
+  
+  tb.findPrev()
+  expect(tb.stat()).to eq Transactd::STATUS_EOF
+  
   tb.setFilter("name = 'あい'", 0, 10)
   expect(tb.recordCount()).to eq 0
+  
   tb.setFilter("name <> ''", 0, 10)
   expect(tb.recordCount()).to eq 5
+  
+  # testing that setFilter don't change field value
+  tb.clearBuffer()
+  tb.setFV('name', 'ABCDE')
+  tb.setFilter("name = 'あい'", 0, 10)
+  expect(tb.getFVstr(FDI_NAME)).to eq 'ABCDE'
+end
+
+def doTestUpdateStringFilter(tb)
+  tb.setKeyNum(0)
+  tb.clearBuffer()
+  tb.seekFirst()
+  expect(tb.stat()).to eq 0
+  tb.setFV('name', 'ABCDE')
+  tb.setFV('namew', 'ABCDEW')
+  tb.update()
+  expect(tb.stat()).to eq 0
+  tb.seekNext()
+  expect(tb.stat()).to eq 0
+  
+  tb.setFV('name', 'ABCDE2')
+  tb.setFV('namew', 'ABCDEW2')
+  tb.update()
+  expect(tb.stat()).to eq 0
+  
+  tb.seekFirst()
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAME)).to eq 'ABCDE'
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'ABCDEW'
+  tb.seekNext()
+  expect(tb.stat()).to eq 0
+  expect(tb.getFVstr(FDI_NAME)).to eq 'ABCDE2'
+  expect(tb.getFVstr(FDI_NAMEW)).to eq 'ABCDEW2'
 end
 
 def doTestStringFilter(db, id, name, type, type2)
@@ -1346,6 +1510,7 @@ def doTestStringFilter(db, id, name, type, type2)
   doTestInsertStringFilter(tb)
   doTestReadStringFilter(tb)
   doTestSetStringFilter(tb)
+  doTestUpdateStringFilter(tb)
   tb.close()
 end
 
@@ -1374,6 +1539,90 @@ def testDropDatabaseStringFilter(db)
   expect(db.stat()).to eq 0
 end
 
+def testQuery()
+  q = Transactd::QueryBase.new()
+  q.queryString("id = 0 and name = 'Abc efg'")
+  expect(q.toString()).to eq "id = '0' and name = 'Abc efg'"
+  
+  q.queryString('')
+  q.where('id', '=', '0').andWhere('name', '=', 'Abc efg')
+  expect(q.toString()).to eq "id = '0' and name = 'Abc efg'"
+  
+  q.queryString("select id,name id = 0 AND name = 'Abc&' efg'")
+  expect(q.toString()).to eq "select id,name id = '0' AND name = 'Abc&' efg'"
+  
+  q.queryString('')
+  q.select('id', 'name').where('id', '=', '0').andWhere('name', '=', "Abc' efg")
+  expect(q.toString()).to eq "select id,name id = '0' and name = 'Abc&' efg'"
+  
+  q.queryString("select id,name id = 0 AND name = 'Abc&& efg'")
+  expect(q.toString()).to eq "select id,name id = '0' AND name = 'Abc&& efg'"
+  
+  q.queryString('')
+  q.select('id', 'name').where('id', '=', '0').andWhere('name', '=', 'Abc& efg')
+  expect(q.toString()).to eq "select id,name id = '0' and name = 'Abc&& efg'"
+  
+  q.queryString('*')
+  expect(q.toString()).to eq '*'
+  
+  q.all()
+  expect(q.toString()).to eq '*'
+  
+  q.queryString('Select id,name id = 2')
+  expect(q.toString()).to eq "select id,name id = '2'"
+  
+  q.queryString('')
+  q.select('id', 'name').where('id', '=', '2')
+  expect(q.toString()).to eq "select id,name id = '2'"
+  
+  q.queryString('SELECT id,name,fc id = 2')
+  expect(q.toString()).to eq "select id,name,fc id = '2'"
+  
+  q.queryString('')
+  q.select('id', 'name', 'fc').where('id', '=', '2')
+  expect(q.toString()).to eq "select id,name,fc id = '2'"
+  
+  q.queryString("select id,name,fc id = 2 and name = '3'")
+  expect(q.toString()).to eq "select id,name,fc id = '2' and name = '3'"
+  
+  q.queryString('')
+  q.select('id', 'name', 'fc').where('id', '=', '2').andWhere('name', '=', '3')
+  expect(q.toString()).to eq "select id,name,fc id = '2' and name = '3'"
+  
+  #  IN include
+  q.queryString("select id,name,fc IN '1','2','3'")
+  expect(q.toString()).to eq "select id,name,fc in '1','2','3'"
+  
+  q.queryString('')
+  q.select('id', 'name', 'fc').In('1', '2', '3')
+  expect(q.toString()).to eq "select id,name,fc in '1','2','3'"
+  
+  q.queryString("IN '1','2','3'")
+  expect(q.toString()).to eq "in '1','2','3'"
+  
+  q.queryString('IN 1,2,3')
+  expect(q.toString()).to eq "in '1','2','3'"
+  
+  q.queryString('')
+  q.In('1', '2', '3')
+  expect(q.toString()).to eq "in '1','2','3'"
+  
+  # special field name
+  q.queryString('select = 1')
+  expect(q.toString()).to eq "select = '1'"
+  
+  q.queryString('')
+  q.where('select', '=', '1')
+  expect(q.toString()).to eq "select = '1'"
+  
+  q.queryString('in <> 1')
+  expect(q.toString()).to eq "in <> '1'"
+  
+  q.queryString('')
+  q.where('in', '<>', '1')
+  expect(q.toString()).to eq "in <> '1'"
+end
+
 
 describe Transactd do
   before :each do
@@ -1405,6 +1654,9 @@ describe Transactd do
   it 'findNext' do
     testFindNext(@db)
   end
+  it 'findIn' do
+    testFindIn(@db)
+  end
   it 'get percentage' do
     testGetPercentage(@db)
   end
@@ -1465,6 +1717,9 @@ describe Transactd do
   it 'login' do
     testLogin(@db)
   end
+  it 'query' do
+    testQuery()
+  end
 end
 
 describe Transactd, 'var tables' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: x86-mswin32-100
 authors:
 - BizStation Corp.
@@ -20,8 +20,8 @@ files:
 - bin/1.9/transactd.so
 - bin/2.0/transactd.so
 - build/tdclrb/bldgem/extconf.rb
-- bin/common/tdclcpp_vc100_32m_1_1.dll
-- bin/common/tdclc_32_1_1.dll
+- bin/common/tdclcpp_vc100_32m_1_2.dll
+- bin/common/tdclc_32_1_2.dll
 - build/tdclrb/gem/detect.rb
 - build/tdclrb/gem/helper.rb
 - build/tdclrb/gem/INSTALLLOG.win32
@@ -33,6 +33,7 @@ files:
 - build/common/system.cmake
 - source/bzs/test/tdclrb/bench_tdclcpp.rb
 - source/bzs/test/tdclrb/prepare.rb
+- source/bzs/test/tdclrb/transactd_blob_spec.rb
 - source/bzs/test/tdclrb/transactd_datetime_spec.rb
 - source/bzs/test/tdclrb/transactd_kanjischema_spec.rb
 - source/bzs/test/tdclrb/transactd_spec.rb