From d22f633bcea0a51dc518bb812569c82f2847d3f7 Mon Sep 17 00:00:00 2001 From: "vladimir%pobox.com" Date: Tue, 15 Nov 2005 19:35:39 +0000 Subject: [PATCH] b=273050, bump interface UUIDs and fix test compilation --- storage/public/mozIStorageConnection.idl | 2 +- storage/public/mozIStorageService.idl | 2 +- storage/public/mozIStorageStatement.idl | 2 +- storage/public/mozIStorageValueArray.idl | 2 +- storage/test/storage1.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/storage/public/mozIStorageConnection.idl b/storage/public/mozIStorageConnection.idl index eeb85b89092..4359b9b7764 100644 --- a/storage/public/mozIStorageConnection.idl +++ b/storage/public/mozIStorageConnection.idl @@ -49,7 +49,7 @@ interface nsIFile; * creating prepared statements, executing SQL, and examining database * errors. */ -[scriptable, uuid(623b8b2e-c9f9-4cc3-b15a-f3c96df2cc1c)] +[scriptable, uuid(e045e635-94af-48af-9a8d-80f1a88a35f3)] interface mozIStorageConnection : nsISupports { /* * Initialization and status diff --git a/storage/public/mozIStorageService.idl b/storage/public/mozIStorageService.idl index 2db40ce2a62..cf509520168 100644 --- a/storage/public/mozIStorageService.idl +++ b/storage/public/mozIStorageService.idl @@ -48,7 +48,7 @@ interface nsIFile; * * This is the only way to open a database connection. */ -[scriptable, uuid(22cff01c-1a5a-4b11-9e27-f8f832226489)] +[scriptable, uuid(a4a0cad9-e0da-4379-bee4-2feef3dddc7e)] interface mozIStorageService : nsISupports { /** * Get a connection to a named special database storage. diff --git a/storage/public/mozIStorageStatement.idl b/storage/public/mozIStorageStatement.idl index 724cdef0d04..421ab641b95 100644 --- a/storage/public/mozIStorageStatement.idl +++ b/storage/public/mozIStorageStatement.idl @@ -45,7 +45,7 @@ interface nsISimpleEnumerator; [ptr] native sqlite3stmtptr(struct sqlite3_stmt); -[scriptable, uuid(656aa634-36e2-4977-802e-79bce39c1024)] +[scriptable, uuid(1f39bc95-090d-40a5-9dee-6d5a591e48bf)] interface mozIStorageStatement : mozIStorageValueArray { /** * Initialize this query with the given SQL statement. diff --git a/storage/public/mozIStorageValueArray.idl b/storage/public/mozIStorageValueArray.idl index 771c14fc1da..9404610b8ed 100644 --- a/storage/public/mozIStorageValueArray.idl +++ b/storage/public/mozIStorageValueArray.idl @@ -44,7 +44,7 @@ * mozIStorageValueArray wraps an array of SQL values, * such as a single database row. */ -[scriptable, uuid(44fc1d3b-dc91-4d17-8bc5-2069d8fd3cca)] +[scriptable, uuid(07b5b93e-113c-4150-863c-d247b003a55d)] interface mozIStorageValueArray : nsISupports { /** * These type values are returned by getTypeOfIndex diff --git a/storage/test/storage1.cpp b/storage/test/storage1.cpp index 787a52d7e1f..d4f73b82ef0 100644 --- a/storage/test/storage1.cpp +++ b/storage/test/storage1.cpp @@ -109,8 +109,8 @@ main (int argc, char **argv) { PRUint32 len; - dbRow->GetNumColumns (&len); - fprintf (stderr, "Row[length %d]: %d '%s'\n", len, dbRow->AsInt32(0), dbRow->AsSharedCString(0, 0)); + dbRow->GetNumEntries (&len); + fprintf (stderr, "Row[length %d]: %d '%s'\n", len, dbRow->AsInt32(0), dbRow->AsSharedUTF8String(0, 0)); } TEST_CHECK_ERROR(rv);