transactd 3.0.0 → 3.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/bin/common/tdclc_32_3_1.dll +0 -0
  3. data/bin/common/tdclc_64_3_1.dll +0 -0
  4. data/build/common/transactd.rc.in +1 -1
  5. data/build/swig/ruby/tdclrb_wrap.cpp +219 -15
  6. data/build/swig/tdcl.i +26 -0
  7. data/build/tdclc/tdclc.cbproj +1 -1
  8. data/build/tdclc/tdclc.rc +5 -5
  9. data/build/tdclcpp/tdclcpp.rc +5 -5
  10. data/build/tdclcpp/tdclcpp_bc.cbproj +1 -1
  11. data/build/tdclrb/tdclrb.rc +5 -5
  12. data/source/bzs/db/engine/mysql/database.cpp +131 -29
  13. data/source/bzs/db/engine/mysql/database.h +8 -6
  14. data/source/bzs/db/engine/mysql/dbManager.cpp +30 -12
  15. data/source/bzs/db/engine/mysql/dbManager.h +1 -1
  16. data/source/bzs/db/engine/mysql/mysqlInternal.h +251 -24
  17. data/source/bzs/db/engine/mysql/mysqlThd.cpp +2 -3
  18. data/source/bzs/db/protocol/tdap/client/bulkInsert.h +2 -2
  19. data/source/bzs/db/protocol/tdap/client/client.h +4 -3
  20. data/source/bzs/db/protocol/tdap/client/connMgr.h +1 -1
  21. data/source/bzs/db/protocol/tdap/client/database.cpp +195 -91
  22. data/source/bzs/db/protocol/tdap/client/database.h +6 -6
  23. data/source/bzs/db/protocol/tdap/client/databaseManager.h +9 -3
  24. data/source/bzs/db/protocol/tdap/client/dbDef.cpp +31 -25
  25. data/source/bzs/db/protocol/tdap/client/dllmain.cpp +4 -2
  26. data/source/bzs/db/protocol/tdap/client/field.cpp +6 -16
  27. data/source/bzs/db/protocol/tdap/client/filter.h +28 -9
  28. data/source/bzs/db/protocol/tdap/client/nsDatabase.cpp +14 -4
  29. data/source/bzs/db/protocol/tdap/client/nsDatabase.h +20 -2
  30. data/source/bzs/db/protocol/tdap/client/pooledDatabaseManager.h +5 -2
  31. data/source/bzs/db/protocol/tdap/client/recordsetImple.h +2 -1
  32. data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp +19 -16
  33. data/source/bzs/db/protocol/tdap/client/table.cpp +2 -1
  34. data/source/bzs/db/protocol/tdap/client/table.h +1 -1
  35. data/source/bzs/db/protocol/tdap/client/trdboostapi.h +13 -9
  36. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.cpp +68 -21
  37. data/source/bzs/db/protocol/tdap/tdapSchema.cpp +3 -7
  38. data/source/bzs/db/protocol/tdap/tdapSchema.h +9 -1
  39. data/source/bzs/db/protocol/tdap/tdapcapi.h +11 -3
  40. data/source/bzs/db/protocol/tdap/uri.h +3 -1
  41. data/source/bzs/env/crosscompile.h +17 -3
  42. data/source/bzs/test/tdclatl/test_v3.js +60 -2
  43. data/source/bzs/test/tdclphp/transactd_Test.php +8 -0
  44. data/source/bzs/test/tdclphp/transactd_blob_Test.php +11 -3
  45. data/source/bzs/test/tdclphp/transactd_v3_Test.php +32 -8
  46. data/source/bzs/test/tdclrb/bench_tdclcpp.rb +7 -7
  47. data/source/bzs/test/tdclrb/transactd_spec.rb +22 -1
  48. data/source/bzs/test/tdclrb/transactd_v3_spec.rb +29 -3
  49. data/source/bzs/test/trdclengn/testField.h +34 -0
  50. data/source/bzs/test/trdclengn/test_tdclcpp_v3.cpp +7 -0
  51. data/source/bzs/test/trdclengn/test_trdclengn.cpp +7 -8
  52. data/source/global/tdclatl/Database.cpp +34 -10
  53. data/source/global/tdclatl/Database.h +5 -5
  54. data/source/global/tdclatl/PooledDbManager.cpp +20 -3
  55. data/source/global/tdclatl/PooledDbManager.h +2 -2
  56. data/source/global/tdclatl/_IDatabaseEvents_CP.h +5 -4
  57. data/source/global/tdclatl/tdclatl.idl +157 -119
  58. metadata +4 -4
  59. data/bin/common/tdclc_32_3_0.dll +0 -0
  60. data/bin/common/tdclc_64_3_0.dll +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c306f79b098fa2ff8dde07e9829cb582639de699
4
- data.tar.gz: 29948dfa51e68d2a39c6d13ef4b45b9c3f348a79
3
+ metadata.gz: 292c1eb18d6ec0984bccc65838a8ae9d6fb45633
4
+ data.tar.gz: 9a5ca6790007635158d4a68ee8e1e0c18accecea
5
5
  SHA512:
6
- metadata.gz: 1eff22d4306982c12033a09670ea6977faadfc36791ed10f4a3806536dfcaafe63bbe6a9aa169f13e319e19ad647be2b7ea0326c4a89b2c5edfdfe08870b441e
7
- data.tar.gz: db58d0d6ed908c9ca10adad8db4e09dd890ecae48dd5c0d80cbb165b35ec54f710fb6d54c3d87785dd691d100c9847e548f47d929fee52fe381a63224e4c4e97
6
+ metadata.gz: 50aa73ef0489a701cc9c71b6b96af04b5f392580bca8b925161a50a9b07710fdde2267a73e467f82d96ce2f8132a599b8c742638eb121da4d136d8a9d8b60e89
7
+ data.tar.gz: 23a05253437594ef75c9248cdefc828eb32bbd2ea38261b879de7faddad22dd7665d89f568a32e0133db464f6fb09f8b7dc332d30efdbc627e5e1214130ef156
Binary file
Binary file
@@ -48,7 +48,7 @@ BEGIN
48
48
  VALUE "CompanyName", "BizStation Corp."
49
49
  VALUE "FileDescription", "@TD_RC_F_DESC@"
50
50
  VALUE "FileVersion", "@TD_RC_F_VER_MAJOR@.@TD_RC_F_VER_MINOR@.@TD_RC_F_VER_RELEASE@.@TD_RC_F_VER_BUILD@"
51
- VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
51
+ VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
52
52
  VALUE "ProductVersion", "@TD_RC_P_VER_MAJOR@.@TD_RC_P_VER_MINOR@.@TD_RC_P_VER_RELEASE@.@TD_RC_P_VER_BUILD@"
53
53
  VALUE "ProductName", "@TD_RC_P_NAME@"
54
54
  END
@@ -1922,8 +1922,10 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
1922
1922
  #define SWIGTYPE_p_bzs__db__protocol__tdap__client__sortField swig_types[89]
1923
1923
  #define SWIGTYPE_p_BOOKMARK swig_types[90]
1924
1924
  #define SWIGTYPE_p_bzs__db__protocol__tdap__bitset swig_types[91]
1925
- static swig_type_info *swig_types[93];
1926
- static swig_module_info swig_module = {swig_types, 92, 0, 0, 0, 0};
1925
+ #define SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos swig_types[92]
1926
+
1927
+ static swig_type_info *swig_types[94];
1928
+ static swig_module_info swig_module = {swig_types, 93, 0, 0, 0, 0};
1927
1929
  #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
1928
1930
  #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
1929
1931
 
@@ -1953,7 +1955,9 @@ static VALUE mTransactd;
1953
1955
  #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
1954
1956
  #define _SYS_TIME_H_
1955
1957
  #else
1956
- #define _GETTIMEOFDAY_DEFINED
1958
+ # ifndef _GETTIMEOFDAY_DEFINED
1959
+ # define _GETTIMEOFDAY_DEFINED
1960
+ # endif
1957
1961
  #endif
1958
1962
  #endif
1959
1963
 
@@ -18416,6 +18420,157 @@ fail:
18416
18420
  }
18417
18421
 
18418
18422
 
18423
+ static swig_class SwigClassBinlogPos;
18424
+
18425
+
18426
+ SWIGINTERN VALUE
18427
+ _wrap_binlogPos_filename_get(int argc, VALUE *argv, VALUE self) {
18428
+ bzs::db::protocol::tdap::client::binlogPos *arg1 = (bzs::db::protocol::tdap::client::binlogPos *) 0 ;
18429
+ void *argp1 = 0 ;
18430
+ int res1 = 0 ;
18431
+ char *result = 0 ;
18432
+ VALUE vresult = Qnil;
18433
+
18434
+ if ((argc < 0) || (argc > 0)) {
18435
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
18436
+ }
18437
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
18438
+ if (!SWIG_IsOK(res1)) {
18439
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::binlogPos *","filename", 1, self ));
18440
+ }
18441
+ arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::binlogPos * >(argp1);
18442
+ result = (char *) ((arg1)->filename);
18443
+ {
18444
+ vresult = rb_enc_str_new(result, strlen(result), rb_enc_find_from_codepage(CP_UTF8));
18445
+ }
18446
+ return vresult;
18447
+ fail:
18448
+ return Qnil;
18449
+ }
18450
+
18451
+
18452
+ SWIGINTERN VALUE
18453
+ _wrap_binlogPos_gtid_get(int argc, VALUE *argv, VALUE self) {
18454
+ bzs::db::protocol::tdap::client::binlogPos *arg1 = (bzs::db::protocol::tdap::client::binlogPos *) 0 ;
18455
+ void *argp1 = 0 ;
18456
+ int res1 = 0 ;
18457
+ char *result = 0 ;
18458
+ VALUE vresult = Qnil;
18459
+
18460
+ if ((argc < 0) || (argc > 0)) {
18461
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
18462
+ }
18463
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
18464
+ if (!SWIG_IsOK(res1)) {
18465
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::binlogPos *","gtid", 1, self ));
18466
+ }
18467
+ arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::binlogPos * >(argp1);
18468
+ result = (char *) ((arg1)->gtid);
18469
+ {
18470
+ vresult = rb_enc_str_new(result, strlen(result), rb_enc_find_from_codepage(CP_UTF8));
18471
+ }
18472
+ return vresult;
18473
+ fail:
18474
+ return Qnil;
18475
+ }
18476
+
18477
+
18478
+ SWIGINTERN VALUE
18479
+ _wrap_binlogPos_pos_get(int argc, VALUE *argv, VALUE self) {
18480
+ bzs::db::protocol::tdap::client::binlogPos *arg1 = (bzs::db::protocol::tdap::client::binlogPos *) 0 ;
18481
+ void *argp1 = 0 ;
18482
+ int res1 = 0 ;
18483
+ unsigned long long result;
18484
+ VALUE vresult = Qnil;
18485
+
18486
+ if ((argc < 0) || (argc > 0)) {
18487
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
18488
+ }
18489
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
18490
+ if (!SWIG_IsOK(res1)) {
18491
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::binlogPos *","pos", 1, self ));
18492
+ }
18493
+ arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::binlogPos * >(argp1);
18494
+ result = (unsigned long long) ((arg1)->pos);
18495
+ vresult = SWIG_From_unsigned_SS_long_SS_long(static_cast< unsigned long long >(result));
18496
+ return vresult;
18497
+ fail:
18498
+ return Qnil;
18499
+ }
18500
+
18501
+
18502
+ SWIGINTERN VALUE
18503
+ _wrap_binlogPos_type_get(int argc, VALUE *argv, VALUE self) {
18504
+ bzs::db::protocol::tdap::client::binlogPos *arg1 = (bzs::db::protocol::tdap::client::binlogPos *) 0 ;
18505
+ void *argp1 = 0 ;
18506
+ int res1 = 0 ;
18507
+ short result;
18508
+ VALUE vresult = Qnil;
18509
+
18510
+ if ((argc < 0) || (argc > 0)) {
18511
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
18512
+ }
18513
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
18514
+ if (!SWIG_IsOK(res1)) {
18515
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::binlogPos *","type", 1, self ));
18516
+ }
18517
+ arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::binlogPos * >(argp1);
18518
+ result = (short) ((arg1)->type);
18519
+ vresult = SWIG_From_short(static_cast< short >(result));
18520
+ return vresult;
18521
+ fail:
18522
+ return Qnil;
18523
+ }
18524
+
18525
+
18526
+ #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
18527
+ SWIGINTERN VALUE
18528
+ _wrap_binlogPos_allocate(VALUE self) {
18529
+ #else
18530
+ SWIGINTERN VALUE
18531
+ _wrap_binlogPos_allocate(int argc, VALUE *argv, VALUE self) {
18532
+ #endif
18533
+
18534
+
18535
+ VALUE vresult = SWIG_NewClassInstance(self, SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos);
18536
+ #ifndef HAVE_RB_DEFINE_ALLOC_FUNC
18537
+ rb_obj_call_init(vresult, argc, argv);
18538
+ #endif
18539
+ return vresult;
18540
+ }
18541
+
18542
+
18543
+ SWIGINTERN VALUE
18544
+ _wrap_new_binlogPos(int argc, VALUE *argv, VALUE self) {
18545
+ bzs::db::protocol::tdap::client::binlogPos *result = 0 ;
18546
+
18547
+ if ((argc < 0) || (argc > 0)) {
18548
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
18549
+ }
18550
+ {
18551
+ try {
18552
+ result = (bzs::db::protocol::tdap::client::binlogPos *)new bzs::db::protocol::tdap::client::binlogPos();
18553
+ DATA_PTR(self) = result;
18554
+ } catch (bzs::rtl::exception& e) {
18555
+ static VALUE bzs_rtl_error = rb_define_class("BZS_RTL_Error", rb_eStandardError);
18556
+ rb_raise(bzs_rtl_error, (* bzs::rtl::getMsg(e)).c_str());
18557
+ } catch (std::exception &e) {
18558
+ static VALUE cpp_std_error = rb_define_class("CPP_STD_Error", rb_eStandardError);
18559
+ rb_raise(cpp_std_error, e.what());
18560
+ }
18561
+ }
18562
+ return self;
18563
+ fail:
18564
+ return Qnil;
18565
+ }
18566
+
18567
+
18568
+ SWIGINTERN void
18569
+ free_bzs_db_protocol_tdap_client_binlogPos(bzs::db::protocol::tdap::client::binlogPos *arg1) {
18570
+ delete arg1;
18571
+ }
18572
+
18573
+
18419
18574
  static swig_class SwigClassNsdatabase;
18420
18575
 
18421
18576
  #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -19183,11 +19338,13 @@ SWIGINTERN VALUE _wrap_nsdatabase_beginSnapshot(int nargs, VALUE *args, VALUE se
19183
19338
  bzs::db::protocol::tdap::client::nsdatabase *arg1 = 0x00;
19184
19339
  short arg2;
19185
19340
  short val2;
19186
-
19341
+ binlogPos* bpos = new binlogPos();
19342
+ memset(bpos, 0, sizeof(binlogPos));
19187
19343
  int _v;
19188
19344
  void *vptr = 0;
19189
19345
  int res;
19190
-
19346
+ VALUE vresult = Qnil;
19347
+
19191
19348
  argc = nargs + 1;
19192
19349
  argv[0] = self;
19193
19350
  if (argc > 3 || argc < 1) SWIG_fail;
@@ -19215,7 +19372,8 @@ SWIGINTERN VALUE _wrap_nsdatabase_beginSnapshot(int nargs, VALUE *args, VALUE se
19215
19372
  static VALUE cpp_std_error = rb_define_class("CPP_STD_Error", rb_eStandardError);
19216
19373
  rb_raise(cpp_std_error, e.what());
19217
19374
  }
19218
- return Qnil;
19375
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(bpos), SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
19376
+ return vresult;
19219
19377
  }
19220
19378
  // check arg2
19221
19379
  if (argc == 2) {
@@ -19229,7 +19387,10 @@ SWIGINTERN VALUE _wrap_nsdatabase_beginSnapshot(int nargs, VALUE *args, VALUE se
19229
19387
  arg2 = static_cast< short >(val2);
19230
19388
  // call beginSnapshot(short bias)
19231
19389
  try {
19232
- (arg1)->beginSnapshot(arg2);
19390
+ if (arg2 == CONSISTENT_READ_WITH_BINLOG_POS)
19391
+ (arg1)->beginSnapshot(arg2, bpos);
19392
+ else
19393
+ (arg1)->beginSnapshot(arg2, NULL);
19233
19394
  } catch (bzs::rtl::exception& e) {
19234
19395
  static VALUE bzs_rtl_error = rb_define_class("BZS_RTL_Error", rb_eStandardError);
19235
19396
  rb_raise(bzs_rtl_error, (* bzs::rtl::getMsg(e)).c_str());
@@ -19237,7 +19398,8 @@ SWIGINTERN VALUE _wrap_nsdatabase_beginSnapshot(int nargs, VALUE *args, VALUE se
19237
19398
  static VALUE cpp_std_error = rb_define_class("CPP_STD_Error", rb_eStandardError);
19238
19399
  rb_raise(cpp_std_error, e.what());
19239
19400
  }
19240
- return Qnil;
19401
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(bpos), SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
19402
+ return vresult;
19241
19403
  }
19242
19404
 
19243
19405
  fail:
@@ -21079,10 +21241,14 @@ fail:
21079
21241
  SWIGINTERN VALUE
21080
21242
  _wrap_database_drop(int argc, VALUE *argv, VALUE self) {
21081
21243
  bzs::db::protocol::tdap::client::database *arg1 = (bzs::db::protocol::tdap::client::database *) 0 ;
21244
+ _TCHAR *arg2 = (_TCHAR *) 0 ;
21082
21245
  void *argp1 = 0 ;
21083
21246
  int res1 = 0 ;
21084
-
21085
- if ((argc < 0) || (argc > 0)) {
21247
+ int res2 ;
21248
+ char *buf2 = 0 ;
21249
+ int alloc2 = 0 ;
21250
+
21251
+ if ((argc < 0) || (argc > 1)) {
21086
21252
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
21087
21253
  }
21088
21254
  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_bzs__db__protocol__tdap__client__database, 0 | 0 );
@@ -21090,9 +21256,17 @@ _wrap_database_drop(int argc, VALUE *argv, VALUE self) {
21090
21256
  SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "bzs::db::protocol::tdap::client::database *","drop", 1, self ));
21091
21257
  }
21092
21258
  arg1 = reinterpret_cast< bzs::db::protocol::tdap::client::database * >(argp1);
21259
+ if (argc == 1)
21260
+ {
21261
+ res2 = SWIG_AsCharPtrAndSize(argv[0], &buf2, NULL, &alloc2);
21262
+ if (!SWIG_IsOK(res2)) {
21263
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "_TCHAR const *","drop", 2, argv[0] ));
21264
+ }
21265
+ arg2 = reinterpret_cast< _TCHAR * >(buf2);
21266
+ }
21093
21267
  {
21094
21268
  try {
21095
- (arg1)->drop();
21269
+ (arg1)->drop(arg2);
21096
21270
  } catch (bzs::rtl::exception& e) {
21097
21271
  static VALUE bzs_rtl_error = rb_define_class("BZS_RTL_Error", rb_eStandardError);
21098
21272
  rb_raise(bzs_rtl_error, (* bzs::rtl::getMsg(e)).c_str());
@@ -21101,8 +21275,10 @@ _wrap_database_drop(int argc, VALUE *argv, VALUE self) {
21101
21275
  rb_raise(cpp_std_error, e.what());
21102
21276
  }
21103
21277
  }
21278
+ if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
21104
21279
  return Qnil;
21105
21280
  fail:
21281
+ if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
21106
21282
  return Qnil;
21107
21283
  }
21108
21284
 
@@ -34523,10 +34699,12 @@ SWIGINTERN VALUE _wrap_pooledDbManager_beginSnapshot(int nargs, VALUE *args, VAL
34523
34699
  bzs::db::protocol::tdap::client::pooledDbManager *arg1 = 0x00;
34524
34700
  short arg2;
34525
34701
  short val2;
34526
-
34702
+ binlogPos* bpos = new binlogPos();
34703
+ memset(bpos, 0, sizeof(binlogPos));
34527
34704
  int _v;
34528
34705
  void *vptr = 0;
34529
34706
  int res;
34707
+ VALUE vresult = Qnil;
34530
34708
 
34531
34709
  argc = nargs + 1;
34532
34710
  argv[0] = self;
@@ -34555,7 +34733,8 @@ SWIGINTERN VALUE _wrap_pooledDbManager_beginSnapshot(int nargs, VALUE *args, VAL
34555
34733
  static VALUE cpp_std_error = rb_define_class("CPP_STD_Error", rb_eStandardError);
34556
34734
  rb_raise(cpp_std_error, e.what());
34557
34735
  }
34558
- return Qnil;
34736
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(bpos), SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
34737
+ return vresult;
34559
34738
  }
34560
34739
  // check arg2
34561
34740
  if (argc == 2) {
@@ -34569,7 +34748,10 @@ SWIGINTERN VALUE _wrap_pooledDbManager_beginSnapshot(int nargs, VALUE *args, VAL
34569
34748
  arg2 = static_cast< short >(val2);
34570
34749
  // call beginSnapshot(short bias)
34571
34750
  try {
34572
- (arg1)->beginSnapshot(arg2);
34751
+ if (arg2 == CONSISTENT_READ_WITH_BINLOG_POS)
34752
+ (arg1)->beginSnapshot(arg2, bpos);
34753
+ else
34754
+ (arg1)->beginSnapshot(arg2, NULL);
34573
34755
  } catch (bzs::rtl::exception& e) {
34574
34756
  static VALUE bzs_rtl_error = rb_define_class("BZS_RTL_Error", rb_eStandardError);
34575
34757
  rb_raise(bzs_rtl_error, (* bzs::rtl::getMsg(e)).c_str());
@@ -34577,7 +34759,8 @@ SWIGINTERN VALUE _wrap_pooledDbManager_beginSnapshot(int nargs, VALUE *args, VAL
34577
34759
  static VALUE cpp_std_error = rb_define_class("CPP_STD_Error", rb_eStandardError);
34578
34760
  rb_raise(cpp_std_error, e.what());
34579
34761
  }
34580
- return Qnil;
34762
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(bpos), SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, 0 | 0 );
34763
+ return vresult;
34581
34764
  }
34582
34765
 
34583
34766
  fail:
@@ -35000,6 +35183,7 @@ static swig_type_info _swigt__p_bzs__db__protocol__tdap__btrVersion = {"_p_bzs__
35000
35183
  static swig_type_info _swigt__p_bzs__db__protocol__tdap__btrVersions = {"_p_bzs__db__protocol__tdap__btrVersions", "bzs::db::protocol::tdap::btrVersions *", 0, 0, (void*)0, 0};
35001
35184
  static swig_type_info _swigt__p_bzs__db__protocol__tdap__client__activeTable = {"_p_bzs__db__protocol__tdap__client__activeTable", "bzs::db::protocol::tdap::client::activeTable *", 0, 0, (void*)0, 0};
35002
35185
  static swig_type_info _swigt__p_bzs__db__protocol__tdap__client__avg = {"_p_bzs__db__protocol__tdap__client__avg", "bzs::db::protocol::tdap::client::avg *", 0, 0, (void*)0, 0};
35186
+ static swig_type_info _swigt__p_bzs__db__protocol__tdap__client__binlogPos = {"_p_bzs__db__protocol__tdap__client__binlogPos", "bzs::db::protocol::tdap::client::binlogPos *", 0, 0, (void*)0, 0};
35003
35187
  static swig_type_info _swigt__p_bzs__db__protocol__tdap__bitset = {"_p_bzs__db__protocol__tdap__bitset", "bzs::db::protocol::tdap::bitset *", 0, 0, (void*)0, 0};
35004
35188
  static swig_type_info _swigt__p_bzs__db__protocol__tdap__client__connectParams = {"_p_bzs__db__protocol__tdap__client__connectParams", "bzs::db::protocol::tdap::client::connectParams *", 0, 0, (void*)0, 0};
35005
35189
  static swig_type_info _swigt__p_bzs__db__protocol__tdap__client__count = {"_p_bzs__db__protocol__tdap__client__count", "bzs::db::protocol::tdap::client::count *", 0, 0, (void*)0, 0};
@@ -35095,6 +35279,7 @@ static swig_type_info *swig_type_initial[] = {
35095
35279
  &_swigt__p_bzs__db__protocol__tdap__client__activeTable,
35096
35280
  &_swigt__p_bzs__db__protocol__tdap__client__autoMemory,
35097
35281
  &_swigt__p_bzs__db__protocol__tdap__client__avg,
35282
+ &_swigt__p_bzs__db__protocol__tdap__client__binlogPos,
35098
35283
  &_swigt__p_bzs__db__protocol__tdap__bitset,
35099
35284
  &_swigt__p_bzs__db__protocol__tdap__client__connectParams,
35100
35285
  &_swigt__p_bzs__db__protocol__tdap__client__count,
@@ -35187,6 +35372,7 @@ static swig_cast_info _swigc__p_bzs__db__protocol__tdap__btrVersion[] = { {&_sw
35187
35372
  static swig_cast_info _swigc__p_bzs__db__protocol__tdap__btrVersions[] = { {&_swigt__p_bzs__db__protocol__tdap__btrVersions, 0, 0, 0},{0, 0, 0, 0}};
35188
35373
  static swig_cast_info _swigc__p_bzs__db__protocol__tdap__client__activeTable[] = { {&_swigt__p_bzs__db__protocol__tdap__client__activeTable, 0, 0, 0},{0, 0, 0, 0}};
35189
35374
  static swig_cast_info _swigc__p_bzs__db__protocol__tdap__client__avg[] = { {&_swigt__p_bzs__db__protocol__tdap__client__avg, 0, 0, 0},{0, 0, 0, 0}};
35375
+ static swig_cast_info _swigc__p_bzs__db__protocol__tdap__client__binlogPos[] = { {&_swigt__p_bzs__db__protocol__tdap__client__binlogPos, 0, 0, 0},{0, 0, 0, 0}};
35190
35376
  static swig_cast_info _swigc__p_bzs__db__protocol__tdap__bitset[] = { {&_swigt__p_bzs__db__protocol__tdap__bitset, 0, 0, 0},{0, 0, 0, 0}};
35191
35377
  static swig_cast_info _swigc__p_bzs__db__protocol__tdap__client__connectParams[] = { {&_swigt__p_bzs__db__protocol__tdap__client__connectParams, 0, 0, 0},{0, 0, 0, 0}};
35192
35378
  static swig_cast_info _swigc__p_bzs__db__protocol__tdap__client__count[] = { {&_swigt__p_bzs__db__protocol__tdap__client__count, 0, 0, 0},{0, 0, 0, 0}};
@@ -35284,6 +35470,7 @@ static swig_cast_info *swig_cast_initial[] = {
35284
35470
  _swigc__p_bzs__db__protocol__tdap__client__activeTable,
35285
35471
  _swigc__p_bzs__db__protocol__tdap__client__autoMemory,
35286
35472
  _swigc__p_bzs__db__protocol__tdap__client__avg,
35473
+ _swigc__p_bzs__db__protocol__tdap__client__binlogPos,
35287
35474
  _swigc__p_bzs__db__protocol__tdap__bitset,
35288
35475
  _swigc__p_bzs__db__protocol__tdap__client__connectParams,
35289
35476
  _swigc__p_bzs__db__protocol__tdap__client__count,
@@ -35733,8 +35920,12 @@ SWIGEXPORT void Init_transactd(void) {
35733
35920
  rb_define_const(mTransactd, "MULTILOCK_NOGAP", SWIG_From_int(static_cast< int >(MULTILOCK_NOGAP)));
35734
35921
  rb_define_const(mTransactd, "MULTILOCK_GAP", SWIG_From_int(static_cast< int >(MULTILOCK_GAP)));
35735
35922
  rb_define_const(mTransactd, "CONSISTENT_READ", SWIG_From_int(static_cast< int >(CONSISTENT_READ)));
35923
+ rb_define_const(mTransactd, "CONSISTENT_READ_WITH_BINLOG_POS", SWIG_From_int(static_cast< int >(CONSISTENT_READ_WITH_BINLOG_POS)));
35736
35924
  rb_define_const(mTransactd, "MULTILOCK_GAP_SHARE", SWIG_From_int(static_cast< int >(MULTILOCK_GAP_SHARE)));
35737
35925
  rb_define_const(mTransactd, "MULTILOCK_NOGAP_SHARE", SWIG_From_int(static_cast< int >(MULTILOCK_NOGAP_SHARE)));
35926
+ rb_define_const(mTransactd, "REPL_POSTYPE_NONE", SWIG_From_int(static_cast< int >(REPL_POSTYPE_NONE)));
35927
+ rb_define_const(mTransactd, "REPL_POSTYPE_MARIA_GTID", SWIG_From_int(static_cast< int >(REPL_POSTYPE_MARIA_GTID)));
35928
+ rb_define_const(mTransactd, "REPL_POSTYPE_POS", SWIG_From_int(static_cast< int >(REPL_POSTYPE_POS)));
35738
35929
  rb_define_const(mTransactd, "ROW_LOCK_X", SWIG_From_int(static_cast< int >(ROW_LOCK_X)));
35739
35930
  rb_define_const(mTransactd, "ROW_LOCK_S", SWIG_From_int(static_cast< int >(ROW_LOCK_S)));
35740
35931
  rb_define_const(mTransactd, "SRV_ISO_READ_UNCOMMITED", SWIG_From_int(static_cast< int >(SRV_ISO_READ_UNCOMMITED)));
@@ -35786,6 +35977,7 @@ SWIGEXPORT void Init_transactd(void) {
35786
35977
  rb_define_const(mTransactd, "STATUS_FIELDTYPE_NOTSUPPORT", SWIG_From_int(static_cast< int >(STATUS_FIELDTYPE_NOTSUPPORT)));
35787
35978
  rb_define_const(mTransactd, "STATUS_INVALID_NULLMODE", SWIG_From_int(static_cast< int >(STATUS_INVALID_NULLMODE)));
35788
35979
  rb_define_const(mTransactd, "STATUS_TOO_LARGE_VALUE", SWIG_From_int(static_cast< int >(STATUS_TOO_LARGE_VALUE)));
35980
+ rb_define_const(mTransactd, "STATUS_SQL_PARSE_ERROR", SWIG_From_int(static_cast< int >(STATUS_SQL_PARSE_ERROR)));
35789
35981
  rb_define_const(mTransactd, "STATUS_SUCCESS", SWIG_From_int(static_cast< int >(STATUS_SUCCESS)));
35790
35982
  rb_define_const(mTransactd, "STATUS_PROGRAM_ERROR", SWIG_From_int(static_cast< int >(STATUS_PROGRAM_ERROR)));
35791
35983
  rb_define_const(mTransactd, "STATUS_IO_ERROR", SWIG_From_int(static_cast< int >(STATUS_IO_ERROR)));
@@ -36303,6 +36495,18 @@ SWIGEXPORT void Init_transactd(void) {
36303
36495
  SwigClassQuery.destroy = (void (*)(void *)) free_bzs_db_protocol_tdap_client_query;
36304
36496
  SwigClassQuery.trackObjects = 0;
36305
36497
 
36498
+ SwigClassBinlogPos.klass = rb_define_class_under(mTransactd, "BinlogPos", rb_cObject);
36499
+ SWIG_TypeClientData(SWIGTYPE_p_bzs__db__protocol__tdap__client__binlogPos, (void *) &SwigClassBinlogPos);
36500
+ rb_define_alloc_func(SwigClassBinlogPos.klass, _wrap_binlogPos_allocate);
36501
+ rb_define_method(SwigClassBinlogPos.klass, "initialize", VALUEFUNC(_wrap_new_binlogPos), -1);
36502
+ rb_define_method(SwigClassBinlogPos.klass, "pos", VALUEFUNC(_wrap_binlogPos_pos_get), -1);
36503
+ rb_define_method(SwigClassBinlogPos.klass, "type", VALUEFUNC(_wrap_binlogPos_type_get), -1);
36504
+ rb_define_method(SwigClassBinlogPos.klass, "filename", VALUEFUNC(_wrap_binlogPos_filename_get), -1);
36505
+ rb_define_method(SwigClassBinlogPos.klass, "gtid", VALUEFUNC(_wrap_binlogPos_gtid_get), -1);
36506
+ SwigClassBinlogPos.mark = 0;
36507
+ SwigClassBinlogPos.destroy = (void (*)(void *)) free_bzs_db_protocol_tdap_client_binlogPos;
36508
+ SwigClassBinlogPos.trackObjects = 0;
36509
+
36306
36510
  SwigClassNsdatabase.klass = rb_define_class_under(mTransactd, "Nsdatabase", rb_cObject);
36307
36511
  SWIG_TypeClientData(SWIGTYPE_p_bzs__db__protocol__tdap__client__nsdatabase, (void *) &SwigClassNsdatabase);
36308
36512
  rb_define_alloc_func(SwigClassNsdatabase.klass, _wrap_nsdatabase_allocate);
data/build/swig/tdcl.i CHANGED
@@ -610,6 +610,20 @@ using namespace bzs::db::protocol::tdap::client;
610
610
  %ignore bzs::db::protocol::tdap::client::nsdatabase::tdapErr;
611
611
  %ignore bzs::db::protocol::tdap::client::reconnectSharedConnection;
612
612
 
613
+ %extend bzs::db::protocol::tdap::client::nsdatabase {
614
+ binlogPos* beginSnapshot(short bias=CONSISTENT_READ) {
615
+ binlogPos* bpos = new binlogPos();
616
+ memset(bpos, 0, sizeof(binlogPos));
617
+ if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
618
+ self->beginSnapshot(bias, bpos);
619
+ else
620
+ self->beginSnapshot(bias, NULL);
621
+ return bpos;
622
+ }
623
+ }
624
+ %ignore bzs::db::protocol::tdap::client::nsdatabase::beginSnapshot;
625
+
626
+
613
627
  // * bzs/db/protocol/tdap/client/nsTable.h *
614
628
  %ignore bzs::db::protocol::tdap::client::nstable::buflen;
615
629
  %ignore bzs::db::protocol::tdap::client::nstable::data;
@@ -630,8 +644,20 @@ using namespace bzs::db::protocol::tdap::client;
630
644
  table* table(const _TCHAR* name) {
631
645
  return self->table(name).get();
632
646
  }
647
+
648
+ binlogPos* beginSnapshot(short bias=CONSISTENT_READ) {
649
+ binlogPos* bpos = new binlogPos();
650
+ memset(bpos, 0, sizeof(binlogPos));
651
+ if (bias == CONSISTENT_READ_WITH_BINLOG_POS)
652
+ self->beginSnapshot(bias, bpos);
653
+ else
654
+ self->beginSnapshot(bias, NULL);
655
+ return bpos;
656
+ }
657
+
633
658
  }
634
659
  %ignore bzs::db::protocol::tdap::client::pooledDbManager::table;
660
+ %ignore bzs::db::protocol::tdap::client::pooledDbManager::beginSnapshot;
635
661
 
636
662
  // * bzs/db/protocol/tdap/client/recordset.h *
637
663
  %ignore bzs::db::protocol::tdap::client::recordset::operator=;
@@ -62,7 +62,7 @@
62
62
  <VerInfo_Locale>1041</VerInfo_Locale>
63
63
  <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
64
64
  <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
65
- <DllSuffix>_3_0</DllSuffix>
65
+ <DllSuffix>_3_1</DllSuffix>
66
66
  <DynamicRTL>false</DynamicRTL>
67
67
  <BPILibOutputDir>..\..\lib</BPILibOutputDir>
68
68
  <BCC_PCHUsage>None</BCC_PCHUsage>
data/build/tdclc/tdclc.rc CHANGED
@@ -29,8 +29,8 @@
29
29
  //
30
30
 
31
31
  VS_VERSION_INFO VERSIONINFO
32
- FILEVERSION 3,0,0,155
33
- PRODUCTVERSION 3,0,0,155
32
+ FILEVERSION 3,1,0,184
33
+ PRODUCTVERSION 3,1,0,184
34
34
  FILEFLAGSMASK 0x3fL
35
35
  #ifdef _DEBUG
36
36
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
47
47
  BEGIN
48
48
  VALUE "CompanyName", "BizStation Corp."
49
49
  VALUE "FileDescription", "Transactd C client"
50
- VALUE "FileVersion", "3.0.0.155"
51
- VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
52
- VALUE "ProductVersion", "3.0.0.155"
50
+ VALUE "FileVersion", "3.1.0.184"
51
+ VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
52
+ VALUE "ProductVersion", "3.1.0.184"
53
53
  VALUE "ProductName", "Transactd Client (GPL V2)"
54
54
  END
55
55
  END
@@ -29,8 +29,8 @@
29
29
  //
30
30
 
31
31
  VS_VERSION_INFO VERSIONINFO
32
- FILEVERSION 3,0,0,155
33
- PRODUCTVERSION 3,0,0,155
32
+ FILEVERSION 3,1,0,184
33
+ PRODUCTVERSION 3,1,0,184
34
34
  FILEFLAGSMASK 0x3fL
35
35
  #ifdef _DEBUG
36
36
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
47
47
  BEGIN
48
48
  VALUE "CompanyName", "BizStation Corp."
49
49
  VALUE "FileDescription", "Transactd C++ client"
50
- VALUE "FileVersion", "3.0.0.155"
51
- VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
52
- VALUE "ProductVersion", "3.0.0.155"
50
+ VALUE "FileVersion", "3.1.0.184"
51
+ VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
52
+ VALUE "ProductVersion", "3.1.0.184"
53
53
  VALUE "ProductName", "Transactd Client (GPL V2)"
54
54
  END
55
55
  END
@@ -153,7 +153,7 @@
153
153
  <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
154
154
  <BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
155
155
  <TD_VER_MAJOR>3</TD_VER_MAJOR>
156
- <TD_VER_MINOR>0</TD_VER_MINOR>
156
+ <TD_VER_MINOR>1</TD_VER_MINOR>
157
157
  <DllSuffix>$(TD_VER_MAJOR)_$(TD_VER_MINOR)</DllSuffix>
158
158
  <TD_CPU>32</TD_CPU>
159
159
  </PropertyGroup>
@@ -29,8 +29,8 @@
29
29
  //
30
30
 
31
31
  VS_VERSION_INFO VERSIONINFO
32
- FILEVERSION 3,0,0,155
33
- PRODUCTVERSION 3,0,0,155
32
+ FILEVERSION 3,1,0,184
33
+ PRODUCTVERSION 3,1,0,184
34
34
  FILEFLAGSMASK 0x3fL
35
35
  #ifdef _DEBUG
36
36
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
47
47
  BEGIN
48
48
  VALUE "CompanyName", "BizStation Corp."
49
49
  VALUE "FileDescription", "Transactd Ruby client"
50
- VALUE "FileVersion", "3.0.0.155"
51
- VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
52
- VALUE "ProductVersion", "3.0.0.155"
50
+ VALUE "FileVersion", "3.1.0.184"
51
+ VALUE "LegalCopyright", "Copyright(C) 2016 BizStation Corp"
52
+ VALUE "ProductVersion", "3.1.0.184"
53
53
  VALUE "ProductName", "Transactd Client (GPL V2)"
54
54
  END
55
55
  END