Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(6)

Delta Between Two Patch Sets: gears/database2/statement.h

Issue 717: Database2Values, argument conversion implemented (Closed) SVN Base: http://google-gears.googlecode.com/svn/contrib/dimitri.glazkov/database2/
Left Patch Set: ready for another look. Created 5 months ago
Right Patch Set: Variant, multiple-row capability added Created 4 months, 3 weeks ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
LEFTRIGHT
1 // Copyright 2008, Google Inc. 1 // Copyright 2008, Google Inc.
2 // 2 //
3 // Redistribution and use in source and binary forms, with or without 3 // Redistribution and use in source and binary forms, with or without
4 // modification, are permitted provided that the following conditions are met: 4 // modification, are permitted provided that the following conditions are met:
5 // 5 //
6 // 1. Redistributions of source code must retain the above copyright notice, 6 // 1. Redistributions of source code must retain the above copyright notice,
7 // this list of conditions and the following disclaimer. 7 // this list of conditions and the following disclaimer.
8 // 2. Redistributions in binary form must reproduce the above copyright notice, 8 // 2. Redistributions in binary form must reproduce the above copyright notice,
9 // this list of conditions and the following disclaimer in the documentation 9 // this list of conditions and the following disclaimer in the documentation
10 // and/or other materials provided with the distribution. 10 // and/or other materials provided with the distribution.
11 // 3. Neither the name of Google Inc. nor the names of its contributors may be 11 // 3. Neither the name of Google Inc. nor the names of its contributors may be
12 // used to endorse or promote products derived from this software without 12 // used to endorse or promote products derived from this software without
13 // specific prior written permission. 13 // specific prior written permission.
14 // 14 //
15 // THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 15 // THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
16 // WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 16 // WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
17 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 17 // MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
18 // EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 18 // EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
19 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 20 // PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
21 // OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 21 // OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
22 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 22 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
23 // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 23 // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
24 // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 25
26 #ifndef GEARS_DATABASE2_STATEMENT_H__ 26 #ifndef GEARS_DATABASE2_STATEMENT_H__
27 #define GEARS_DATABASE2_STATEMENT_H__ 27 #define GEARS_DATABASE2_STATEMENT_H__
28
29 #include <vector>
28 30
29 #include "gears/base/common/common.h" 31 #include "gears/base/common/common.h"
30 #include "gears/base/common/js_types.h" 32 #include "gears/base/common/js_types.h"
31 #include "gears/third_party/scoped_ptr/scoped_ptr.h" 33 #include "gears/third_party/scoped_ptr/scoped_ptr.h"
32 34
33 // forward declarations 35 // forward declarations
34 class Database2; 36 class Database2;
35 class Database2Transaction; 37 class Database2Transaction;
36 class Database2Values; 38 class Database2Values;
37 39
(...skipping 26 matching lines...) Show 10 above Show 10 below
64 // if true, the statement has invalid arguments 66 // if true, the statement has invalid arguments
65 bool bogus_; 67 bool bogus_;
66 std::string16 sql_statement_; 68 std::string16 sql_statement_;
67 scoped_ptr<Database2Values> arguments_; 69 scoped_ptr<Database2Values> arguments_;
68 scoped_ptr<JsRootedCallback> callback_; 70 scoped_ptr<JsRootedCallback> callback_;
69 scoped_ptr<JsRootedCallback> error_callback_; 71 scoped_ptr<JsRootedCallback> error_callback_;
70 72
71 DISALLOW_EVIL_CONSTRUCTORS(Database2Statement); 73 DISALLOW_EVIL_CONSTRUCTORS(Database2Statement);
72 }; 74 };
73 75
74 // Used for marshaling statement arguments to the database thread and 76 // Used for marshaling statement arguments to the database thread and results to
75 // results to the main thread. 77 // the main thread. A union-based structure is used to store value-type pairs.
76 // JsParamToSend is used to store the value-type pairs, and as a result the
77 // values are heap-allocated, which is unfortunate in the case of int/double.
78 // TODO(dimitri.glazkov): Reimplement using unions, possibly reusing or
79 // integrating with MarshaledJsToken
80 class Database2Values { 78 class Database2Values {
Aaron 2008/05/22 22:16:42 The shape of this internal class is really bugging
Dimitri 2008/05/24 02:13:40 On 2008/05/22 22:16:42, Aaron wrote: > The shape o
81 public: 79 public:
82 ~Database2Values(); 80 Database2Values() {}
81 ~Database2Values() {
82 // remove all rows
83 for(unsigned int i = 0; i < rows_.size(); i++) {
84 delete[] rows_[i];
85 }
86 }
83 87
84 static bool CreateFromJsArray(const JsArray *sql_arguments, 88 static bool CreateFromJsArray(const JsArray *js_array,
85 Database2Values **instance); 89 Database2Values **instance);
86 90
91 // methods for reading values
87 int length() const { return length_; } 92 int length() const { return length_; }
93 void Reset() { current_row_ = 0; }
94 bool Next();
88 JsParamType GetType(int index) const; 95 JsParamType GetType(int index) const;
89 int GetAsInt(int index) const; 96 bool GetElementAsInt(int index, int *value);
90 double GetAsDouble(int index) const; 97 bool GetElementAsDouble(int index, double *value);
91 std::string16 &GetAsString(int index) const; 98 bool GetElementAsString(int index, std::string16 *value);
99
92 private: 100 private:
93 Database2Values() {} 101 void StartNewRow();
94 102
95 static bool SetJsParamToSend(const JsArray *js_array, 103 // used to store value-type pairs
96 int index, 104 struct Variant {
97 JsParamToSend *param); 105 Variant() : type(JSPARAM_NULL) {}
106 ~Variant() {
107 if (type == JSPARAM_STRING16) { delete string_value; }
108 }
98 109
99 scoped_array<JsParamToSend> arguments_; 110 JsParamType type;
111 union {
112 int int_value;
113 double double_value;
114 std::string16 *string_value;
115 };
116 };
117
118 inline Variant &current(int index) const {
119 assert(index >= 0 && index < length_);
120 assert(current_row_ < length_);
121 return rows_[current_row_][index];
122 }
123
124 friend class vector;
125 std::vector<Variant*> rows_;
100 int length_; 126 int length_;
127 int current_row_;
101 128
102 DISALLOW_EVIL_CONSTRUCTORS(Database2Values); 129 DISALLOW_EVIL_CONSTRUCTORS(Database2Values);
103 }; 130 };
104 131
105 #endif // GEARS_DATABASE2_STATEMENT_H__ 132 #endif // GEARS_DATABASE2_STATEMENT_H__
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld r338