transactd 3.5.0 → 3.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (83) hide show
  1. checksums.yaml +4 -4
  2. data/bin/common/{tdclc_32_3_5.dll → tdclc_32_3_6.dll} +0 -0
  3. data/bin/common/tdclc_64_3_6.dll +0 -0
  4. data/build/swig/ruby/tdclrb_wrap.cpp +12524 -24430
  5. data/build/swig/tdcl.i +5 -0
  6. data/build/tdclc/tdclc.cbproj +1 -1
  7. data/build/tdclc/tdclc.rc +4 -4
  8. data/build/tdclcpp/tdclcpp.rc +4 -4
  9. data/build/tdclcpp/tdclcpp_bc.cbproj +1 -1
  10. data/build/tdclrb/tdclrb.rc +4 -4
  11. data/source/bzs/db/engine/mysql/database.cpp +210 -184
  12. data/source/bzs/db/engine/mysql/database.h +276 -105
  13. data/source/bzs/db/engine/mysql/mysqlInternal.h +37 -0
  14. data/source/bzs/db/engine/mysql/mysqlProtocol.cpp +1 -0
  15. data/source/bzs/db/protocol/hs/hsCommandExecuter.cpp +4 -4
  16. data/source/bzs/db/protocol/tdap/client/activeTable.h +1 -1
  17. data/source/bzs/db/protocol/tdap/client/activeTableImple.h +1 -0
  18. data/source/bzs/db/protocol/tdap/client/connMgr.cpp +1 -1
  19. data/source/bzs/db/protocol/tdap/client/database.cpp +7 -4
  20. data/source/bzs/db/protocol/tdap/client/database.h +6 -1
  21. data/source/bzs/db/protocol/tdap/client/databaseManager.h +2 -2
  22. data/source/bzs/db/protocol/tdap/client/dbDef.cpp +21 -9
  23. data/source/bzs/db/protocol/tdap/client/dbDef.h +1 -1
  24. data/source/bzs/db/protocol/tdap/client/dllmain.cpp +10 -2
  25. data/source/bzs/db/protocol/tdap/client/field.cpp +29 -5
  26. data/source/bzs/db/protocol/tdap/client/field.h +3 -1
  27. data/source/bzs/db/protocol/tdap/client/fieldNameAlias.cpp +5 -0
  28. data/source/bzs/db/protocol/tdap/client/fieldNameAlias.h +1 -0
  29. data/source/bzs/db/protocol/tdap/client/fields.h +9 -2
  30. data/source/bzs/db/protocol/tdap/client/groupQuery.cpp +8 -4
  31. data/source/bzs/db/protocol/tdap/client/memRecord.cpp +18 -5
  32. data/source/bzs/db/protocol/tdap/client/memRecord.h +2 -2
  33. data/source/bzs/db/protocol/tdap/client/nsTable.cpp +46 -13
  34. data/source/bzs/db/protocol/tdap/client/nsTable.h +5 -0
  35. data/source/bzs/db/protocol/tdap/client/recordset.cpp +5 -0
  36. data/source/bzs/db/protocol/tdap/client/recordset.h +1 -0
  37. data/source/bzs/db/protocol/tdap/client/recordsetImple.h +6 -2
  38. data/source/bzs/db/protocol/tdap/client/request.h +46 -38
  39. data/source/bzs/db/protocol/tdap/client/sqlBuilder.cpp +2 -3
  40. data/source/bzs/db/protocol/tdap/client/stringConverter.h +29 -13
  41. data/source/bzs/db/protocol/tdap/client/table.cpp +60 -10
  42. data/source/bzs/db/protocol/tdap/client/table.h +4 -1
  43. data/source/bzs/db/protocol/tdap/client/trdboostapi.h +18 -1
  44. data/source/bzs/db/protocol/tdap/client/trdormapi.h +10 -4
  45. data/source/bzs/db/protocol/tdap/fieldComp.h +1 -1
  46. data/source/bzs/db/protocol/tdap/mysql/characterset.h +1 -0
  47. data/source/bzs/db/protocol/tdap/mysql/databaseSchema.cpp +11 -4
  48. data/source/bzs/db/protocol/tdap/mysql/databaseSchema.h +2 -1
  49. data/source/bzs/db/protocol/tdap/mysql/recordsetReader.h +52 -94
  50. data/source/bzs/db/protocol/tdap/mysql/request.h +20 -13
  51. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.cpp +92 -60
  52. data/source/bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h +4 -4
  53. data/source/bzs/db/protocol/tdap/tdapRequest.h +11 -0
  54. data/source/bzs/db/protocol/tdap/tdapSchema.cpp +83 -34
  55. data/source/bzs/db/protocol/tdap/tdapSchema.h +5 -1
  56. data/source/bzs/db/protocol/tdap/tdapcapi.h +7 -3
  57. data/source/bzs/example/ormap_c.cpp +2 -2
  58. data/source/bzs/netsvc/server/serverPipe.cpp +35 -1
  59. data/source/bzs/test/tdclatl/test_v3.js +48 -1
  60. data/source/bzs/test/tdclphp/bench.php +89 -76
  61. data/source/bzs/test/tdclphp/transactd_Test.php +691 -687
  62. data/source/bzs/test/tdclphp/transactd_blob_Test.php +46 -43
  63. data/source/bzs/test/tdclphp/transactd_datetime_Test.php +46 -43
  64. data/source/bzs/test/tdclphp/transactd_kanjischema_Test.php +33 -33
  65. data/source/bzs/test/tdclphp/transactd_pool_Test.php +29 -25
  66. data/source/bzs/test/tdclphp/transactd_v3_Test.php +653 -183
  67. data/source/bzs/test/tdclrb/transactd_datetime_spec.rb +40 -4
  68. data/source/bzs/test/tdclrb/transactd_fetch_spec.rb +785 -0
  69. data/source/bzs/test/tdclrb/transactd_pool_spec.rb +21 -1
  70. data/source/bzs/test/tdclrb/transactd_setget_spec.rb +450 -0
  71. data/source/bzs/test/tdclrb/transactd_spec.rb +14 -2
  72. data/source/bzs/test/tdclrb/transactd_v3_spec.rb +1192 -11
  73. data/source/bzs/test/trdclengn/testField.h +522 -1
  74. data/source/bzs/test/trdclengn/test_tdclcpp_v3.cpp +37 -1
  75. data/source/bzs/test/trdclengn/test_trdclengn.cpp +62 -4
  76. data/source/global/tdclatl/RecordsetQuery.cpp +2 -1
  77. data/source/global/tdclatl/RecordsetQuery.h +1 -1
  78. data/source/global/tdclatl/Table.cpp +17 -0
  79. data/source/global/tdclatl/Table.h +3 -1
  80. data/source/global/tdclatl/tdclatl.idl +7 -2
  81. data/transactd.gemspec +1 -1
  82. metadata +7 -5
  83. data/bin/common/tdclc_64_3_5.dll +0 -0
@@ -1,6 +1,6 @@
1
1
  <?php
2
2
  /* ================================================================
3
- Copyright (C) 2014 BizStation Corp All rights reserved.
3
+ Copyright (C) 2014,2016 BizStation Corp All rights reserved.
4
4
 
5
5
  This program is free software; you can redistribute it and/or
6
6
  modify it under the terms of the GNU General Public License
@@ -17,12 +17,16 @@
17
17
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
18
18
  02111-1307, USA.
19
19
  ================================================================ */
20
- mb_internal_encoding('UTF-8');
21
20
 
22
- require_once("transactd.php");
23
- use BizStation\Transactd as Bz;
24
- Bz\transactd::setRecordValueMode(Bz\transactd::RECORD_KEYVALUE_FIELDVALUE);
21
+ require("transactd.php");
25
22
 
23
+ use BizStation\Transactd\Transactd;
24
+ use BizStation\Transactd\PooledDbManager;
25
+ use BizStation\Transactd\ConnectParams;
26
+ use BizStation\Transactd\Query;
27
+ use BizStation\Transactd\ActiveTable;
28
+
29
+ Transactd::setFieldValueMode(Transactd::FIELD_VALUE_MODE_VALUE);
26
30
 
27
31
  function getHost()
28
32
  {
@@ -59,7 +63,7 @@ if(class_exists('Thread')){
59
63
  public function run()
60
64
  {
61
65
  //echo ('... waiting to get ' . $this->name . " ...\n");
62
- $dbm = new Bz\pooledDbManager(new Bz\connectParams($this->url));
66
+ $dbm = new PooledDbManager(new ConnectParams($this->url));
63
67
  //echo ('GOT ' . $this->name . ' ! sleep ' . $this->sleep . "sec ...\n");
64
68
  sleep($this->sleep);
65
69
  $dbm->unUse();
@@ -68,30 +72,30 @@ if(class_exists('Thread')){
68
72
  }
69
73
  }
70
74
 
71
- class transactdPoolTest extends PHPUnit_Framework_TestCase
75
+ class TransactdPoolTest extends PHPUnit_Framework_TestCase
72
76
  {
73
77
  public function testConnectParams()
74
78
  {
75
- $cp = new Bz\connectParams(URL);
79
+ $cp = new ConnectParams(URL);
76
80
  $this->assertEquals($cp->uri(), URL);
77
- $cp = new Bz\connectParams(PROTOCOL, HOSTNAME, DBNAME, SCHEMANAME, USERNAME, PASSWORD);
81
+ $cp = new ConnectParams(PROTOCOL, HOSTNAME, DBNAME, SCHEMANAME, USERNAME, PASSWORD);
78
82
  $this->assertEquals($cp->uri(), URL);
79
83
  }
80
84
  public function testUse()
81
85
  {
82
- Bz\pooledDbManager::setMaxConnections(3);
83
- $cp = new Bz\connectParams(URL);
86
+ PooledDbManager::setMaxConnections(3);
87
+ $cp = new ConnectParams(URL);
84
88
  $this->assertEquals($cp->uri(), URL);
85
- $dbm1 = new Bz\pooledDbManager($cp);
86
- $dbm2 = new Bz\pooledDbManager($cp);
87
- $dbm3 = new Bz\pooledDbManager($cp);
89
+ $dbm1 = new PooledDbManager($cp);
90
+ $dbm2 = new PooledDbManager($cp);
91
+ $dbm3 = new PooledDbManager($cp);
88
92
  $dbm1->unUse();
89
- $dbm4 = new Bz\pooledDbManager($cp);
93
+ $dbm4 = new PooledDbManager($cp);
90
94
  $dbm3->unUse();
91
- $dbm5 = new Bz\pooledDbManager($cp);
92
- Bz\pooledDbManager::setMaxConnections(5);
93
- $dbm1 = new Bz\pooledDbManager($cp);
94
- $dbm3 = new Bz\pooledDbManager($cp);
95
+ $dbm5 = new PooledDbManager($cp);
96
+ PooledDbManager::setMaxConnections(5);
97
+ $dbm1 = new PooledDbManager($cp);
98
+ $dbm3 = new PooledDbManager($cp);
95
99
  $dbm1->unUse();
96
100
  $dbm2->unUse();
97
101
  $dbm3->unUse();
@@ -100,12 +104,12 @@ class transactdPoolTest extends PHPUnit_Framework_TestCase
100
104
  }
101
105
  public function testConnect()
102
106
  {
103
- Bz\pooledDbManager::setMaxConnections(3);
104
- $cp = new Bz\connectParams(URL);
107
+ PooledDbManager::setMaxConnections(3);
108
+ $cp = new ConnectParams(URL);
105
109
  $this->assertEquals($cp->uri(), URL);
106
- $dbm = new Bz\pooledDbManager($cp);
107
- $atu = new Bz\ActiveTable($dbm, 'user');
108
- $q = new Bz\query();
110
+ $dbm = new PooledDbManager($cp);
111
+ $atu = new ActiveTable($dbm, 'user');
112
+ $q = new Query();
109
113
  $atu->alias('名前', 'name');
110
114
  $q->select('id', 'name', 'group')->where('id', '<=', 15000);
111
115
  $rs = $atu->index(0)->keyValue(1)->read($q);
@@ -123,7 +127,7 @@ class transactdPoolTest extends PHPUnit_Framework_TestCase
123
127
  echo(' * class Thread not found! * ');
124
128
  return;
125
129
  }
126
- Bz\pooledDbManager::setMaxConnections(5);
130
+ PooledDbManager::setMaxConnections(5);
127
131
  $t = array();
128
132
  for ($i = 1; $i <= 12; $i++)
129
133
  {