20219 2008-07-29 20:44:31 -0700 Databases pane doesn't recognize table creation/deletion 2019-08-09 14:13:45 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED http://webkit.org/misc/DatabaseExample.html P2 Normal --- 1 dev+webkit webkit-unassigned aroben cjerdonek commit-queue dbates eric jmonte03 joepeck mjs timothy webkit.review.bot oldest_to_newest 87347 0 dev+webkit 2008-07-29 20:44:31 -0700 The Inspector's Databases panel doesn't recognize when a table is created or deleted. 1. Load <http://webkit.org/misc/DatabaseExample.html> 2. Open the Inspector and switch to the Databases panel 3. Expand the NoteTest database (notice the WebKitStickyNotes table) and then focus it 4. Enter the following in the db console: DROP TABLE WebKitStickyNotes The WebKitStickyNotes table should disappear from the sidebar, instead, clicking on it brings up the stale datagrid and switching again gives an error that the table could not be read. Two empty error lines are also added to the global console. 126502 1 joepeck 2009-06-17 11:19:21 -0700 CREATE/DELETE table statements aren't working at all at the moment in r44702: > CREATE TABLE x (id REAL); An unexpected error 0 occured. > DROP TABLE WebKitStickyNotes An unexpected error 0 occured. Its worth mentioning that "occured" is a typo and should be spelled "occurred"!! 213670 2 53610 jmonte03 2010-04-17 14:53:46 -0700 Created attachment 53610 Proposed patch. 213673 3 webkit.review.bot 2010-04-17 14:58:11 -0700 Attachment 53610 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 213677 4 53610 joepeck 2010-04-17 15:18:39 -0700 Comment on attachment 53610 Proposed patch. Looks good. I haven't actually tried it locally yet but it looks simple enough. Some minor issues that would need to be fixed in order for this to get accepted. > +2010-04-17 Juan C. Montemayor <jmonte03@cs.tufts.edu> > + > + Reviewed by NOBODY (OOPS!). > + > + Bug 20219 - Databases pane doesn't recognize table creation/deletion > + https://bugs.webkit.org/show_bug.cgi?id=20219 Nit: prepare-ChangeLog should not have added the "Bug 20219" part, because the link itself has that. You can remove that text. > _queryFinished: function(query, result) > { > var dataGrid = WebInspector.panels.storage.dataGridForResult(result); > - if (!dataGrid) > - return; > + > + if(dataGrid){ > dataGrid.element.addStyleClass("inline"); > this._appendQueryResult(query, dataGrid.element); > dataGrid.autoSizeColumns(5); > + } The code inside the if should be indented (4 spaces) as per the style guidelines: http://webkit.org/coding/coding-style.html > if (query.match(/^create /i) || query.match(/^drop table /i)) > WebInspector.panels.storage.updateDatabaseTables(this.database); > + > + if(!dataGrid) > + return; > + No need to move this code here, since its the end of the function anyways. The code can just be deleted. 213685 5 53617 jmonte03 2010-04-17 15:53:40 -0700 Created attachment 53617 Proposed patch (updated) Thanks Joseph for the comments. 213686 6 webkit.review.bot 2010-04-17 15:57:02 -0700 Attachment 53617 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 213689 7 53617 joepeck 2010-04-17 16:29:26 -0700 Comment on attachment 53617 Proposed patch (updated) > +2010-04-17 Juan C. Montemayor <jmonte03@cs.tufts.edu> > + > + Reviewed by NOBODY (OOPS!). > + > + Databases pane doesn't recognize table creation/deletion > + > + https://bugs.webkit.org/show_bug.cgi?id=20219 Nit: Its preferred that you don't have this newline. > _queryFinished: function(query, result) > { > var dataGrid = WebInspector.panels.storage.dataGridForResult(result); > - if (!dataGrid) > - return; > - dataGrid.element.addStyleClass("inline"); > - this._appendQueryResult(query, dataGrid.element); > - dataGrid.autoSizeColumns(5); > + > + if(dataGrid){ > + dataGrid.element.addStyleClass("inline"); > + this._appendQueryResult(query, dataGrid.element); > + dataGrid.autoSizeColumns(5); > + } Nit: Trailing whitespace (like that empty line) is a pet peeve of mine. In fact, the blank here isn't needed and can be removed. > if (query.match(/^create /i) || query.match(/^drop table /i)) > WebInspector.panels.storage.updateDatabaseTables(this.database); You should also update this code. If the user input has leading whitespace these regex's don't match. Could you update this so it is something like the following: var trimmedQuery = query.trim(); if (trimmedQuery.match(/^create /i) || trimmedQuery.match(/^drop table /i)) WebInspector.panels.storage.updateDatabaseTables(this.database); Or better yet, trim the query somewhere earlier on (like as soon as we get the user input) so mistakes like this will pop up less frequently. r+ if you make these changes! 213690 8 53618 jmonte03 2010-04-17 16:53:50 -0700 Created attachment 53618 Proposed patch (updated, v2) I hope I got rid of all the unwanted whitespace that was mentioned. However, I separated the variables from the if statements, *hopefully* a good idea. Let me know. I also made the changes you suggested replacing query with trimmedQuery. 213691 9 webkit.review.bot 2010-04-17 16:57:51 -0700 Attachment 53618 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 Total errors found: 0 in 0 files If any of these errors are false positives, please file a bug against check-webkit-style. 213692 10 joepeck 2010-04-17 17:01:27 -0700 Aha. I see why the style bot is yelling. Because you're using tabs and not spaces! Sorry I didn't notice this before. You have some options. Either I can land this patch for you (keeping you in the ChangeLog so you get credit of course) or you can replace the tabs with 4 spaces. Do you have a preference? 213693 11 53619 jmonte03 2010-04-17 17:03:14 -0700 Created attachment 53619 Proposed patch (updated, v3) Removed a rogue tab character. Sorry for overlooking this. 213694 12 53619 joepeck 2010-04-17 17:06:04 -0700 Comment on attachment 53619 Proposed patch (updated, v3) Excellent. Thanks! 213696 13 joepeck 2010-04-17 17:09:24 -0700 Ahh, it looks like I just missed you in IRC. You can always join #webkit or #webkit-inspector if you want to talk directly to someone. I am JoePeck! 213705 14 53619 commit-queue 2010-04-17 19:44:24 -0700 Comment on attachment 53619 Proposed patch (updated, v3) Rejecting patch 53619 from commit-queue. Found no modified ChangeLogs, cannot create a commit message. All changes require a ChangeLog. See: http://webkit.org/coding/contributing.html 213712 15 53619 joepeck 2010-04-17 21:58:41 -0700 Comment on attachment 53619 Proposed patch (updated, v3) > diff --git WebCore/ChangeLog WebCore/ChangeLog > index e0aa101..082f4f6 100644 > --- WebCore/ChangeLog > +++ WebCore/ChangeLog Very Interesting. I haven't seen a git patch like this before. Juan, what version of git are you using? I would recommend using at least version 1.6.2. Although the diff is correct, the output should actually look like this. Note that line 2 is irrelevant, its the "a/" and "b/" that are missing that worry me and confused the bot. > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > index de3b493..9e5ed89 100644 > --- a/WebCore/ChangeLog > +++ b/WebCore/ChangeLog I am going to land this manually, and I'll put a patch up of what I landed (identical to Juan's but with a style change and usable by git in the future). Weird! 213713 16 joepeck 2010-04-17 22:04:33 -0700 Nicely done Juan! Committed r57789 M WebCore/ChangeLog M WebCore/inspector/front-end/DatabaseQueryView.js r57789 = e794dcd6652a60d068b39acb7df614d34952aa19 (trunk) http://trac.webkit.org/changeset/57789 213714 17 53624 joepeck 2010-04-17 22:05:41 -0700 Created attachment 53624 [PATCH] Patch that Landed This is the patch that landed. Attached for archival reasons. 213715 18 eric 2010-04-17 22:21:20 -0700 Chris or Dan might know if this is something svn-apply should support. 213716 19 joepeck 2010-04-17 22:29:32 -0700 I actually tried to manually apply this patch locally. First with `git apply` then with `svn-apply` and both failed. My guess is that this is an older form of git patch which we need not be concerned with. But, I'd love to hear more from others. Thanks for following up on this Eric! 213727 20 cjerdonek 2010-04-18 02:01:06 -0700 (In reply to comment #15) > (From update of attachment 53619 [details]) > > diff --git WebCore/ChangeLog WebCore/ChangeLog > > index e0aa101..082f4f6 100644 > > --- WebCore/ChangeLog > > +++ WebCore/ChangeLog > > Very Interesting. I haven't seen a git patch like this before. Juan, what > version of git are you using? I would recommend using at least version 1.6.2. > Although the diff is correct, the output should actually look like this. Note > that line 2 is irrelevant, its the "a/" and "b/" that are missing that worry me > and confused the bot. This past change might be relevant: https://bugs.webkit.org/show_bug.cgi?id=32820 213790 21 jmonte03 2010-04-18 13:23:46 -0700 Thanks for all your help guys. I was actually calling "git diff --no-prefix > file" I called git diff without the no-prefix flag and it now includes the "a/" and "b/" Won't happen again! 213791 22 eric 2010-04-18 13:25:38 -0700 Seems we should fix our scripts to understand git diff --no-prefix diffs. 213792 23 eric 2010-04-18 13:26:15 -0700 Looks like we already have a bug on this. bug 32438. 1560020 24 mjs 2019-08-09 14:13:45 -0700 *** Bug 200220 has been marked as a duplicate of this bug. *** 53610 2010-04-17 14:53:46 -0700 2010-04-17 15:53:40 -0700 Proposed patch. DatabaseQueryViewPatch.patch text/plain 1600 jmonte03 ZGlmZiAtLWdpdCBXZWJDb3JlL0NoYW5nZUxvZyBXZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMGFh MTAxLi4xMmZhM2JjIDEwMDY0NAotLS0gV2ViQ29yZS9DaGFuZ2VMb2cKKysrIFdlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMTcgIEp1YW4gQy4gTW9udGVtYXlvciAg PGptb250ZTAzQGNzLnR1ZnRzLmVkdT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCdWcgMjAyMTkgLSBEYXRhYmFzZXMgcGFuZSBkb2Vzbid0IHJlY29n bml6ZSB0YWJsZSBjcmVhdGlvbi9kZWxldGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMTkKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1l bmQvRGF0YWJhc2VRdWVyeVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VR dWVyeVZpZXcucHJvdG90eXBlLl9xdWVyeUZpbmlzaGVkKToKKyAgICAgICAgVXBkYXRlIHRoZSBz dG9yYWdlIHBhbmVsIGV2ZW4gaWYgdGhlcmUgaXMgbm90IGEgRGF0YUdyaWQgc2hvd2luZworICAg ICAgICAKIDIwMTAtMDQtMTQgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYgLS1naXQgV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzIFdlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcwppbmRleCBjYzkwMmU3Li4zYTcw MGQzIDEwMDY0NAotLS0gV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlW aWV3LmpzCisrKyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcu anMKQEAgLTE0MCwxNCArMTQwLDE5IEBAIFdlYkluc3BlY3Rvci5EYXRhYmFzZVF1ZXJ5Vmlldy5w cm90b3R5cGUgPSB7CiAgICAgX3F1ZXJ5RmluaXNoZWQ6IGZ1bmN0aW9uKHF1ZXJ5LCByZXN1bHQp CiAgICAgewogICAgICAgICB2YXIgZGF0YUdyaWQgPSBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3Jh Z2UuZGF0YUdyaWRGb3JSZXN1bHQocmVzdWx0KTsKLSAgICAgICAgaWYgKCFkYXRhR3JpZCkKLSAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgCisgICAgICAgIGlmKGRhdGFHcmlkKXsKICAgICAg ICAgZGF0YUdyaWQuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJpbmxpbmUiKTsKICAgICAgICAgdGhp cy5fYXBwZW5kUXVlcnlSZXN1bHQocXVlcnksIGRhdGFHcmlkLmVsZW1lbnQpOwogICAgICAgICBk YXRhR3JpZC5hdXRvU2l6ZUNvbHVtbnMoNSk7CisgICAgICAgIH0KIAogICAgICAgICBpZiAocXVl cnkubWF0Y2goL15jcmVhdGUgL2kpIHx8IHF1ZXJ5Lm1hdGNoKC9eZHJvcCB0YWJsZSAvaSkpCiAg ICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UudXBkYXRlRGF0YWJhc2VUYWJs ZXModGhpcy5kYXRhYmFzZSk7CisKKyAgICAgICAgaWYoIWRhdGFHcmlkKQorICAgICAgICAgICAg cmV0dXJuOworCiAgICAgfSwKIAogICAgIF9xdWVyeUVycm9yOiBmdW5jdGlvbihxdWVyeSwgZXJy b3IpCg== 53617 2010-04-17 15:53:40 -0700 2010-04-17 16:53:50 -0700 Proposed patch (updated) DatabaseQueryViewPatch.patch text/plain 1578 jmonte03 ZGlmZiAtLWdpdCBXZWJDb3JlL0NoYW5nZUxvZyBXZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMGFh MTAxLi4yZWE2MWE3IDEwMDY0NAotLS0gV2ViQ29yZS9DaGFuZ2VMb2cKKysrIFdlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMTcgIEp1YW4gQy4gTW9udGVtYXlvciAg PGptb250ZTAzQGNzLnR1ZnRzLmVkdT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEYXRhYmFzZXMgcGFuZSBkb2Vzbid0IHJlY29nbml6ZSB0YWJsZSBj cmVhdGlvbi9kZWxldGlvbgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMDIxOQkKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJh c2VRdWVyeVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcu cHJvdG90eXBlLl9xdWVyeUZpbmlzaGVkKToKKyAgICAgICAgCiAyMDEwLTA0LTE0ICBBbGV4YW5k ZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg VGltb3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9E YXRhYmFzZVF1ZXJ5Vmlldy5qcyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VR dWVyeVZpZXcuanMKaW5kZXggY2M5MDJlNy4uZTUxZjA5ZCAxMDA2NDQKLS0tIFdlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcworKysgV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzCkBAIC0xNDAsMTEgKzE0MCwxMiBAQCBX ZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogICAgIF9xdWVyeUZp bmlzaGVkOiBmdW5jdGlvbihxdWVyeSwgcmVzdWx0KQogICAgIHsKICAgICAgICAgdmFyIGRhdGFH cmlkID0gV2ViSW5zcGVjdG9yLnBhbmVscy5zdG9yYWdlLmRhdGFHcmlkRm9yUmVzdWx0KHJlc3Vs dCk7Ci0gICAgICAgIGlmICghZGF0YUdyaWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAg IGRhdGFHcmlkLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiaW5saW5lIik7Ci0gICAgICAgIHRoaXMu X2FwcGVuZFF1ZXJ5UmVzdWx0KHF1ZXJ5LCBkYXRhR3JpZC5lbGVtZW50KTsKLSAgICAgICAgZGF0 YUdyaWQuYXV0b1NpemVDb2x1bW5zKDUpOworICAgICAgICAKKyAgICAgICAgaWYoZGF0YUdyaWQp eworICAgICAgICAgICAgZGF0YUdyaWQuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJpbmxpbmUiKTsK KyAgICAgICAgICAgIHRoaXMuX2FwcGVuZFF1ZXJ5UmVzdWx0KHF1ZXJ5LCBkYXRhR3JpZC5lbGVt ZW50KTsKKyAgICAgICAgICAgIGRhdGFHcmlkLmF1dG9TaXplQ29sdW1ucyg1KTsKKyAgICAgICAg fQogCiAgICAgICAgIGlmIChxdWVyeS5tYXRjaCgvXmNyZWF0ZSAvaSkgfHwgcXVlcnkubWF0Y2go L15kcm9wIHRhYmxlIC9pKSkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc3RvcmFn ZS51cGRhdGVEYXRhYmFzZVRhYmxlcyh0aGlzLmRhdGFiYXNlKTsK 53618 2010-04-17 16:53:50 -0700 2010-04-17 17:03:14 -0700 Proposed patch (updated, v2) DatabaseQueryViewPatch.patch text/plain 1708 jmonte03 ZGlmZiAtLWdpdCBXZWJDb3JlL0NoYW5nZUxvZyBXZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMGFh MTAxLi4xOWU1YzBiIDEwMDY0NAotLS0gV2ViQ29yZS9DaGFuZ2VMb2cKKysrIFdlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDQtMTcgIEp1YW4gQy4gTW9udGVtYXlvciAg PGptb250ZTAzQGNzLnR1ZnRzLmVkdT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEYXRhYmFzZXMgcGFuZSBkb2Vzbid0IHJlY29nbml6ZSB0YWJsZSBj cmVhdGlvbi9kZWxldGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAyMTkJCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNl UXVlcnlWaWV3LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LnBy b3RvdHlwZS5fcXVlcnlGaW5pc2hlZCk6CisgICAgICAgIAogMjAxMC0wNC0xNCAgQWxleGFuZGVy IFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFRp bW90aHkgSGF0Y2hlci4KZGlmZiAtLWdpdCBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0 YWJhc2VRdWVyeVZpZXcuanMgV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVl cnlWaWV3LmpzCmluZGV4IGNjOTAyZTcuLjhhODU1YTYgMTAwNjQ0Ci0tLSBXZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcuanMKKysrIFdlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcwpAQCAtMTQwLDEzICsxNDAsMTQgQEAgV2Vi SW5zcGVjdG9yLkRhdGFiYXNlUXVlcnlWaWV3LnByb3RvdHlwZSA9IHsKICAgICBfcXVlcnlGaW5p c2hlZDogZnVuY3Rpb24ocXVlcnksIHJlc3VsdCkKICAgICB7CiAgICAgICAgIHZhciBkYXRhR3Jp ZCA9IFdlYkluc3BlY3Rvci5wYW5lbHMuc3RvcmFnZS5kYXRhR3JpZEZvclJlc3VsdChyZXN1bHQp OwotICAgICAgICBpZiAoIWRhdGFHcmlkKQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBk YXRhR3JpZC5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImlubGluZSIpOwotICAgICAgICB0aGlzLl9h cHBlbmRRdWVyeVJlc3VsdChxdWVyeSwgZGF0YUdyaWQuZWxlbWVudCk7Ci0gICAgICAgIGRhdGFH cmlkLmF1dG9TaXplQ29sdW1ucyg1KTsKLQotICAgICAgICBpZiAocXVlcnkubWF0Y2goL15jcmVh dGUgL2kpIHx8IHF1ZXJ5Lm1hdGNoKC9eZHJvcCB0YWJsZSAvaSkpCisJCXZhciB0cmltbWVkUXVl cnkgPSBxdWVyeS50cmltKCk7CisJCQorICAgICAgICBpZihkYXRhR3JpZCl7CisgICAgICAgICAg ICBkYXRhR3JpZC5lbGVtZW50LmFkZFN0eWxlQ2xhc3MoImlubGluZSIpOworICAgICAgICAgICAg dGhpcy5fYXBwZW5kUXVlcnlSZXN1bHQodHJpbW1lZFF1ZXJ5LCBkYXRhR3JpZC5lbGVtZW50KTsK KyAgICAgICAgICAgIGRhdGFHcmlkLmF1dG9TaXplQ29sdW1ucyg1KTsKKyAgICAgICAgfQorICAg ICAgICBpZiAodHJpbW1lZFF1ZXJ5Lm1hdGNoKC9eY3JlYXRlIC9pKSB8fCB0cmltbWVkUXVlcnku bWF0Y2goL15kcm9wIHRhYmxlIC9pKSkKICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMu c3RvcmFnZS51cGRhdGVEYXRhYmFzZVRhYmxlcyh0aGlzLmRhdGFiYXNlKTsKICAgICB9LAogCg== 53619 2010-04-17 17:03:14 -0700 2010-04-17 22:05:41 -0700 Proposed patch (updated, v3) DatabaseQueryViewPatch.patch text/plain 1709 jmonte03 ZGlmZiAtLWdpdCBXZWJDb3JlL0NoYW5nZUxvZyBXZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMGFh MTAxLi4wODJmNGY2IDEwMDY0NAotLS0gV2ViQ29yZS9DaGFuZ2VMb2cKKysrIFdlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDQtMTcgIEp1YW4gQy4gTW9udGVtYXlvciAg PGptb250ZTAzQGNzLnR1ZnRzLmVkdT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEYXRhYmFzZXMgcGFuZSBkb2Vzbid0IHJlY29nbml6ZSB0YWJsZSBj cmVhdGlvbi9kZWxldGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjAyMTkKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VR dWVyeVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJv dG90eXBlLl9xdWVyeUZpbmlzaGVkKToKKyAgICAgICAgCiAyMDEwLTA0LTE0ICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGlt b3RoeSBIYXRjaGVyLgpkaWZmIC0tZ2l0IFdlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EYXRh YmFzZVF1ZXJ5Vmlldy5qcyBXZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGF0YWJhc2VRdWVy eVZpZXcuanMKaW5kZXggY2M5MDJlNy4uZDU4ZTNlOCAxMDA2NDQKLS0tIFdlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcworKysgV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3LmpzCkBAIC0xNDAsMTMgKzE0MCwxNCBAQCBXZWJJ bnNwZWN0b3IuRGF0YWJhc2VRdWVyeVZpZXcucHJvdG90eXBlID0gewogICAgIF9xdWVyeUZpbmlz aGVkOiBmdW5jdGlvbihxdWVyeSwgcmVzdWx0KQogICAgIHsKICAgICAgICAgdmFyIGRhdGFHcmlk ID0gV2ViSW5zcGVjdG9yLnBhbmVscy5zdG9yYWdlLmRhdGFHcmlkRm9yUmVzdWx0KHJlc3VsdCk7 Ci0gICAgICAgIGlmICghZGF0YUdyaWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGRh dGFHcmlkLmVsZW1lbnQuYWRkU3R5bGVDbGFzcygiaW5saW5lIik7Ci0gICAgICAgIHRoaXMuX2Fw cGVuZFF1ZXJ5UmVzdWx0KHF1ZXJ5LCBkYXRhR3JpZC5lbGVtZW50KTsKLSAgICAgICAgZGF0YUdy aWQuYXV0b1NpemVDb2x1bW5zKDUpOworICAgICAgICB2YXIgdHJpbW1lZFF1ZXJ5ID0gcXVlcnku dHJpbSgpOwogCi0gICAgICAgIGlmIChxdWVyeS5tYXRjaCgvXmNyZWF0ZSAvaSkgfHwgcXVlcnku bWF0Y2goL15kcm9wIHRhYmxlIC9pKSkKKyAgICAgICAgaWYoZGF0YUdyaWQpeworICAgICAgICAg ICAgZGF0YUdyaWQuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJpbmxpbmUiKTsKKyAgICAgICAgICAg IHRoaXMuX2FwcGVuZFF1ZXJ5UmVzdWx0KHRyaW1tZWRRdWVyeSwgZGF0YUdyaWQuZWxlbWVudCk7 CisgICAgICAgICAgICBkYXRhR3JpZC5hdXRvU2l6ZUNvbHVtbnMoNSk7CisgICAgICAgIH0KKyAg ICAgICAgaWYgKHRyaW1tZWRRdWVyeS5tYXRjaCgvXmNyZWF0ZSAvaSkgfHwgdHJpbW1lZFF1ZXJ5 Lm1hdGNoKC9eZHJvcCB0YWJsZSAvaSkpCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucGFuZWxz LnN0b3JhZ2UudXBkYXRlRGF0YWJhc2VUYWJsZXModGhpcy5kYXRhYmFzZSk7CiAgICAgfSwKIAo= 53624 2010-04-17 22:05:41 -0700 2010-04-17 22:05:41 -0700 [PATCH] Patch that Landed patch text/plain 1724 joepeck ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGUzYjQ5My4uOWU1ZWQ4OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMC0wNC0xNyAgSnVhbiBDLiBNb250 ZW1heW9yICA8am1vbnRlMDNAY3MudHVmdHMuZWR1PgorCisgICAgICAgIFJldmlld2VkIGJ5IEpv c2VwaCBQZWNvcmFyby4KKworICAgICAgICBEYXRhYmFzZXMgcGFuZSBkb2Vzbid0IHJlY29nbml6 ZSB0YWJsZSBjcmVhdGlvbi9kZWxldGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMTkKKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv RGF0YWJhc2VRdWVyeVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YWJhc2VRdWVy eVZpZXcucHJvdG90eXBlLl9xdWVyeUZpbmlzaGVkKToKKwogMjAxMC0wNC0xNyAgWWFhciBTY2hu aXRtYW4gIDx5YWFyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJh cnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVl cnlWaWV3LmpzIGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RhdGFiYXNlUXVlcnlWaWV3 LmpzCmluZGV4IGNjOTAyZTcuLjM4YzhkZjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9EYXRhYmFzZVF1ZXJ5Vmlldy5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRGF0YWJhc2VRdWVyeVZpZXcuanMKQEAgLTE0MCwxMyArMTQwLDE1IEBAIFdlYklu c3BlY3Rvci5EYXRhYmFzZVF1ZXJ5Vmlldy5wcm90b3R5cGUgPSB7CiAgICAgX3F1ZXJ5RmluaXNo ZWQ6IGZ1bmN0aW9uKHF1ZXJ5LCByZXN1bHQpCiAgICAgewogICAgICAgICB2YXIgZGF0YUdyaWQg PSBXZWJJbnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UuZGF0YUdyaWRGb3JSZXN1bHQocmVzdWx0KTsK LSAgICAgICAgaWYgKCFkYXRhR3JpZCkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgZGF0 YUdyaWQuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJpbmxpbmUiKTsKLSAgICAgICAgdGhpcy5fYXBw ZW5kUXVlcnlSZXN1bHQocXVlcnksIGRhdGFHcmlkLmVsZW1lbnQpOwotICAgICAgICBkYXRhR3Jp ZC5hdXRvU2l6ZUNvbHVtbnMoNSk7CisgICAgICAgIHZhciB0cmltbWVkUXVlcnkgPSBxdWVyeS50 cmltKCk7CisKKyAgICAgICAgaWYgKGRhdGFHcmlkKSB7CisgICAgICAgICAgICBkYXRhR3JpZC5l bGVtZW50LmFkZFN0eWxlQ2xhc3MoImlubGluZSIpOworICAgICAgICAgICAgdGhpcy5fYXBwZW5k UXVlcnlSZXN1bHQodHJpbW1lZFF1ZXJ5LCBkYXRhR3JpZC5lbGVtZW50KTsKKyAgICAgICAgICAg IGRhdGFHcmlkLmF1dG9TaXplQ29sdW1ucyg1KTsgICAgICAgICAgICAKKyAgICAgICAgfQogCi0g ICAgICAgIGlmIChxdWVyeS5tYXRjaCgvXmNyZWF0ZSAvaSkgfHwgcXVlcnkubWF0Y2goL15kcm9w IHRhYmxlIC9pKSkKKyAgICAgICAgaWYgKHRyaW1tZWRRdWVyeS5tYXRjaCgvXmNyZWF0ZSAvaSkg fHwgdHJpbW1lZFF1ZXJ5Lm1hdGNoKC9eZHJvcCB0YWJsZSAvaSkpCiAgICAgICAgICAgICBXZWJJ bnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UudXBkYXRlRGF0YWJhc2VUYWJsZXModGhpcy5kYXRhYmFz ZSk7CiAgICAgfSwKIAo=