Bug 68205 - Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
: Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
Status: RESOLVED FIXED
Product: WebKit
Classification: Unclassified
Component: New Bugs
: 528+ (Nightly build)
: Unspecified Unspecified
: P2 Normal
Assigned To: Adam Barth
:
Depends on:
Blocks: 68012
  Show dependency treegraph
 
Reported: 2011-09-15 18:34 PDT by Adam Barth
Modified: 2011-09-16 10:39 PDT (History)
1 user (show)

See Also:


Attachments
Patch (149.53 KB, patch)
2011-09-15 18:36 PDT, Adam Barth
no flags Details | Formatted Diff | Diff
Patch (150.04 KB, patch)
2011-09-15 20:51 PDT, Adam Barth
no flags Details | Formatted Diff | Diff
Patch (150.47 KB, patch)
2011-09-15 21:51 PDT, Adam Barth
eric: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Adam Barth 2011-09-15 18:34:25 PDT
Rename ENABLE(DATABASE) to ENABLE(SQL_DATABASE)
Comment 1 Adam Barth 2011-09-15 18:36:06 PDT
Created attachment 107581 [details]
Patch
Comment 2 Early Warning System Bot 2011-09-15 18:59:47 PDT
Comment on attachment 107581 [details]
Patch

Attachment 107581 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/9706157
Comment 3 Gyuyoung Kim 2011-09-15 19:06:40 PDT
Comment on attachment 107581 [details]
Patch

Attachment 107581 [details] did not pass efl-ews (efl):
Output: http://queues.webkit.org/results/9694259
Comment 4 Adam Barth 2011-09-15 20:51:06 PDT
Created attachment 107597 [details]
Patch
Comment 5 Early Warning System Bot 2011-09-15 21:11:12 PDT
Comment on attachment 107597 [details]
Patch

Attachment 107597 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/9709054
Comment 6 Adam Barth 2011-09-15 21:51:56 PDT
Created attachment 107602 [details]
Patch
Comment 7 Eric Seidel 2011-09-15 22:08:46 PDT
Comment on attachment 107602 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107602&action=review

build-webkit changes?  You might want to grep for"database_" as well.

> configure.ac:1135
> +AM_CONDITIONAL([ENABLE_SQL_DATABASE],[test "$enable_sql_database" = "yes"])

I'm surprised this isn't referenced in more places in this file.

> Source/JavaScriptCore/wtf/Platform.h:816
> -#if !defined(ENABLE_DATABASE)
> -#define ENABLE_DATABASE 1
> +#if !defined(ENABLE_SQL_DATABASE)
> +#define ENABLE_SQL_DATABASE 1
>  #endif

I thought we'd moved away from this model?
Comment 8 Adam Barth 2011-09-15 22:19:06 PDT
(In reply to comment #7)
> (From update of attachment 107602 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=107602&action=review
> 
> build-webkit changes?  You might want to grep for"database_" as well.

Oops.  Fixed.

> > configure.ac:1135
> > +AM_CONDITIONAL([ENABLE_SQL_DATABASE],[test "$enable_sql_database" = "yes"])
> 
> I'm surprised this isn't referenced in more places in this file.

I'll double-check.

> > Source/JavaScriptCore/wtf/Platform.h:816
> > -#if !defined(ENABLE_DATABASE)
> > -#define ENABLE_DATABASE 1
> > +#if !defined(ENABLE_SQL_DATABASE)
> > +#define ENABLE_SQL_DATABASE 1
> >  #endif
> 
> I thought we'd moved away from this model?

I think that's the plan, but I'm not sure it's happened yet.
Comment 9 Adam Barth 2011-09-15 22:40:21 PDT
Committed r95271: <http://trac.webkit.org/changeset/95271>
Comment 10 Csaba Osztrogonác 2011-09-16 09:08:47 PDT
Comment on attachment 107602 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=107602&action=review

> Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:235
> -#endif /* ENABLE(DATABASE) */
> +#endif // ENABLE(SQL_DATABASE)

This change was incorrect, it broke binding test.
Fix landed in http://trac.webkit.org/changeset/95294
Comment 11 Adam Barth 2011-09-16 10:22:41 PDT
(In reply to comment #10)
> (From update of attachment 107602 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=107602&action=review
> 
> > Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp:235
> > -#endif /* ENABLE(DATABASE) */
> > +#endif // ENABLE(SQL_DATABASE)
> 
> This change was incorrect, it broke binding test.
> Fix landed in http://trac.webkit.org/changeset/95294

Thanks for fixing it, but I think that means the code generation script has a (minor!) bug.  It should generate C++ style comments.  /me will fix.
Comment 12 Adam Barth 2011-09-16 10:39:22 PDT
GObject script fix in https://bugs.webkit.org/show_bug.cgi?id=68256