Following up from #1321540: Convert DBTNG to namespaces; separate Drupal bits, database.inc was forgotten in core/includes/database. It should be moved with it's brothers in core/includes :)

CommentFileSizeAuthor
#9 database_inc-7.patch2.85 KBamateescu
#1 database_inc-second_try.patch2.85 KBamateescu
database_inc.patch185 bytesamateescu
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

amateescu’s picture

amateescu CreditAttribution: amateescu commented
FileSize
database_inc-second_try.patch2.85 KB

And now with a working patch.

sun’s picture

sun
Primary language German
Location Karlsruhe
CreditAttribution: sun commented
Status: Needs review » Reviewed & tested by the community

Will most likely come back green, so RTBC. Thanks!

David Strauss’s picture

David Strauss
he/him
CreditAttribution: David Strauss commented
Title: database.inc feels lonely in it's database ivory tower » database.inc feels lonely in its database ivory tower

Status: Reviewed & tested by the community » Needs work

The last submitted patch, database_inc-second_try.patch, failed testing.

Crell’s picture

Crell CreditAttribution: Crell commented

If I'm reading it correctly, #1 is missing the file move.

amateescu’s picture

amateescu CreditAttribution: amateescu commented

@Crell, It's there:

diff --git a/core/includes/database/database.inc b/core/includes/database.inc
similarity index 100%
rename from core/includes/database/database.inc
rename to core/includes/database.inc
Tor Arne Thune’s picture

Tor Arne Thune CreditAttribution: Tor Arne Thune commented
Status: Needs work » Needs review

It's there, but difficult to spot. There was a problem with test bot earlier, so retesting.

Tor Arne Thune’s picture

Tor Arne Thune CreditAttribution: Tor Arne Thune commented

#1: database_inc-second_try.patch queued for re-testing.

amateescu’s picture

amateescu CreditAttribution: amateescu commented
FileSize
database_inc-7.patch2.85 KB

Let's try to move the rename operation at the bottom.

Status: Needs review » Needs work

The last submitted patch, database_inc-7.patch, failed testing.

Tor Arne Thune’s picture

Tor Arne Thune CreditAttribution: Tor Arne Thune commented
Status: Needs work » Reviewed & tested by the community

Patch in #1 passed, so setting to RTBC as per #2.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, database_inc-7.patch, failed testing.

amateescu’s picture

amateescu CreditAttribution: amateescu commented
Status: Needs work » Reviewed & tested by the community

There were some testbot issues, described in #1465780-7: Sporadical test failures for a patch that moves a file, which are resolved now, so back to RTBC.

Dries’s picture

Dries CreditAttribution: Dries commented
Status: Reviewed & tested by the community » Fixed

Committed to 8.x. Thanks!

xjm’s picture

xjm
she/her
Primary language English
CreditAttribution: xjm commented
Title: database.inc feels lonely in its database ivory tower » [HEAD BROKEN] database.inc feels lonely in its database ivory tower
Category: task » bug
Priority: Normal » Critical
Status: Fixed » Reviewed & tested by the community

The file was deleted but not added to the new directory.

Generally it's a good idea to do this before a commit:

git status

to check for untracked files and see what changes are present or staged.

See also:
http://xjm.drupalgardens.com/blog/gitignore

You can also use

git apply --index
xjm’s picture

xjm
she/her
Primary language English
CreditAttribution: xjm commented

I'd suggest:

git revert 5c45ddc9cf1
git apply --index database_inc-7.patch
git status
(confirm file is staged)
git commit -am "Issue #1464940 by amateescu: Fixed database.inc feels lonely in its database ivory tower."
git push origin 8.x
devuo’s picture

devuo CreditAttribution: devuo commented

Yeah, that's what I was going to suggest, except for the commit message :P

Tor Arne Thune’s picture

Tor Arne Thune CreditAttribution: Tor Arne Thune commented
xjm’s picture

xjm
she/her
Primary language English
CreditAttribution: xjm commented

@devuo: Got rid of the [HEAD BROKEN]. :D

patrickd’s picture

patrickd CreditAttribution: patrickd commented
Title: [HEAD BROKEN] database.inc feels lonely in its database ivory tower » database.inc feels lonely in its database ivory tower
Status: Reviewed & tested by the community » Fixed

HEAD is now working for me,
phew, I was shocked for a moment xP

I think this is fixed now? :>

xjm’s picture

xjm
she/her
Primary language English
CreditAttribution: xjm commented
Category: bug » task
Priority: Critical » Normal

Indeed, fixed here:
http://drupalcode.org/project/drupal.git/commit/73c878b

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.