| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "bindings/modules/v8/V8SQLTransactionSync.h" | 32 #include "bindings/modules/v8/V8SQLTransactionSync.h" |
| 33 | 33 |
| 34 #include "bindings/modules/v8/V8SQLResultSet.h" | 34 #include "bindings/modules/v8/V8SQLResultSet.h" |
| 35 #include "bindings/v8/ExceptionState.h" | 35 #include "bindings/v8/ExceptionState.h" |
| 36 #include "bindings/v8/V8Binding.h" | 36 #include "bindings/v8/V8Binding.h" |
| 37 #include "core/dom/ExceptionCode.h" | 37 #include "core/dom/ExceptionCode.h" |
| 38 #include "modules/webdatabase/sqlite/SQLValue.h" | |
| 39 #include "modules/webdatabase/DatabaseSync.h" | 38 #include "modules/webdatabase/DatabaseSync.h" |
| 40 #include "modules/webdatabase/SQLResultSet.h" | 39 #include "modules/webdatabase/SQLResultSet.h" |
| 40 #include "modules/webdatabase/sqlite/SQLValue.h" |
| 41 #include "wtf/Vector.h" | 41 #include "wtf/Vector.h" |
| 42 | 42 |
| 43 using namespace WTF; | 43 using namespace WTF; |
| 44 | 44 |
| 45 namespace WebCore { | 45 namespace WebCore { |
| 46 | 46 |
| 47 void V8SQLTransactionSync::executeSqlMethodCustom(const v8::FunctionCallbackInfo
<v8::Value>& info) | 47 void V8SQLTransactionSync::executeSqlMethodCustom(const v8::FunctionCallbackInfo
<v8::Value>& info) |
| 48 { | 48 { |
| 49 ExceptionState exceptionState(ExceptionState::ExecutionContext, "executeSql"
, "SQLTransactionSync", info.Holder(), info.GetIsolate()); | 49 ExceptionState exceptionState(ExceptionState::ExecutionContext, "executeSql"
, "SQLTransactionSync", info.Holder(), info.GetIsolate()); |
| 50 if (!info.Length()) { | 50 if (!info.Length()) { |
| (...skipping 19 matching lines...) Expand all Loading... |
| 70 | 70 |
| 71 if (isUndefinedOrNull(length)) | 71 if (isUndefinedOrNull(length)) |
| 72 sqlArgsLength = sqlArgsObject->GetPropertyNames()->Length(); | 72 sqlArgsLength = sqlArgsObject->GetPropertyNames()->Length(); |
| 73 else | 73 else |
| 74 sqlArgsLength = length->Uint32Value(); | 74 sqlArgsLength = length->Uint32Value(); |
| 75 | 75 |
| 76 for (unsigned i = 0; i < sqlArgsLength; ++i) { | 76 for (unsigned i = 0; i < sqlArgsLength; ++i) { |
| 77 v8::Handle<v8::Integer> key = v8::Integer::New(info.GetIsolate(), i)
; | 77 v8::Handle<v8::Integer> key = v8::Integer::New(info.GetIsolate(), i)
; |
| 78 TONATIVE_VOID(v8::Local<v8::Value>, value, sqlArgsObject->Get(key)); | 78 TONATIVE_VOID(v8::Local<v8::Value>, value, sqlArgsObject->Get(key)); |
| 79 | 79 |
| 80 if (value.IsEmpty() || value->IsNull()) | 80 if (value.IsEmpty() || value->IsNull()) { |
| 81 sqlValues.append(SQLValue()); | 81 sqlValues.append(SQLValue()); |
| 82 else if (value->IsNumber()) { | 82 } else if (value->IsNumber()) { |
| 83 TONATIVE_VOID(double, sqlValue, value->NumberValue()); | 83 TONATIVE_VOID(double, sqlValue, value->NumberValue()); |
| 84 sqlValues.append(SQLValue(sqlValue)); | 84 sqlValues.append(SQLValue(sqlValue)); |
| 85 } else { | 85 } else { |
| 86 TOSTRING_VOID(V8StringResource<>, sqlValue, value); | 86 TOSTRING_VOID(V8StringResource<>, sqlValue, value); |
| 87 sqlValues.append(SQLValue(sqlValue)); | 87 sqlValues.append(SQLValue(sqlValue)); |
| 88 } | 88 } |
| 89 } | 89 } |
| 90 } | 90 } |
| 91 | 91 |
| 92 SQLTransactionSync* transaction = V8SQLTransactionSync::toNative(info.Holder
()); | 92 SQLTransactionSync* transaction = V8SQLTransactionSync::toNative(info.Holder
()); |
| 93 | 93 |
| 94 v8::Handle<v8::Value> result = toV8(transaction->executeSQL(statement, sqlVa
lues, exceptionState), info.Holder(), info.GetIsolate()); | 94 v8::Handle<v8::Value> result = toV8(transaction->executeSQL(statement, sqlVa
lues, exceptionState), info.Holder(), info.GetIsolate()); |
| 95 if (exceptionState.throwIfNeeded()) | 95 if (exceptionState.throwIfNeeded()) |
| 96 return; | 96 return; |
| 97 | 97 |
| 98 v8SetReturnValue(info, result); | 98 v8SetReturnValue(info, result); |
| 99 } | 99 } |
| 100 | 100 |
| 101 } // namespace WebCore | 101 } // namespace WebCore |
| OLD | NEW |