fix 'node' node-type module attribute

"Atributes" is not spelled "Atributes", but rather "Attributes". So, cnw.

So I agree that the code that's working around this is utter cruft and should be done away with. However, I don't think 'module' => 'node_content' is a good fix, because there is no module called node_content, so this is going to be terribly confusing from a DX perspective.

Since 'module' is a misnomer and is actually not meant to represent a module at all, but rather intended to be "the prefix applied to all node hook function names," a better solution is to rename that to something more descriptive while we're fixing this bug, and fix two problems at once. An informal poll of #drupal said sun's suggestion of 'hook_prefix' was best, and that seems the most intuitive to me.

subscribing for later review

'prefix' is fine with me. Ran all tests with the patch applied and they pass fine.

Sorry, really minor, but wrong indentation here:

+  $ret[] = update_sql("UPDATE {node_type} SET module = 'node_content' WHERE module = 'node'");
+   db_change_field($ret, 'node_type', 'module', 'prefix', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE));

Set back to RTBC afterwards.

Hm. I am getting a bunch of these:

notice: Undefined property: stdClass::$prefix in /Applications/MAMP/htdocs/core/modules/node/node.module on line 626.

on admin/build/testing. Can anyone else confirm?

Well, certainly helps when I run update.php. ;)

However, at the last step of update.php I get:

( ! ) PDOException: UPDATE {node_type} SET type=:db_update_placeholder_0, name=:db_update_placeholder_1, prefix=:db_update_placeholder_2, has_title=:db_update_placeholder_3, title_label=:db_update_placeholder_4, has_body=:db_update_placeholder_5, body_label=:db_update_placeholder_6, description=:db_update_placeholder_7, help=:db_update_placeholder_8, min_word_count=:db_update_placeholder_9, custom=:db_update_placeholder_10, modified=:db_update_placeholder_11, locked=:db_update_placeholder_12 WHERE (type = :db_condition_placeholder_501) - Array ( [:db_update_placeholder_0] => blog [:db_update_placeholder_1] => Blog entry [:db_update_placeholder_2] => blog [:db_update_placeholder_3] => 1 [:db_update_placeholder_4] => Title [:db_update_placeholder_5] => 1 [:db_update_placeholder_6] => Body [:db_update_placeholder_7] => A blog entry is a single post to an online journal, or blog. [:db_update_placeholder_8] => [:db_update_placeholder_9] => 0 [:db_update_placeholder_10] => 0 [:db_update_placeholder_11] => [:db_update_placeholder_12] => 1 [:db_condition_placeholder_501] => blog ) SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'modified' at row 1 in /Applications/MAMP/htdocs/core/includes/database/database.inc on line 365

Looks like this still needs work.

The problem came from having blog module installed, and node_type_save() which happens at the end of update.php when the cache is cleared. modified deafaults to a NULL value which is getting cast to 0. Peter is working on a fix.

The ginormous insert and update queries in node_type_save() are a textbook case where you want to use a merge query instead, methinks. At minimum you want to build $fields in advance and just pass it in to each query, so you only have to maintain that array once, but I'm pretty sure that a merge query is the correct solution here.

Merge queries absolutely work according to the unit tests. Documentation is in progress. You also don't have to update all fields if you don't want to. (Or if you do, that's a bug.)

Whether or not merging those queries into one merge statement is scope creep or not I will defer to webchick.

Base works just as well, and slightly less of a loaded term in core. So this should be ready to go. Already ran tests with prefix, ran some again with base, no issues (and I can confirm the exception is unrelated to this patch).

Documentation for merge queries is still a stub - so let's defer that to a later issue.

Hm. Dang it!

( ! ) PDOException: INSERT INTO {node_type} (type, name, base, has_title, title_label, has_body, body_label, description, help, min_word_count, custom, modified, locked, orig_type) VALUES (:db_insert_placeholder_0, :db_insert_placeholder_1, :db_insert_placeholder_2, :db_insert_placeholder_3, :db_insert_placeholder_4, :db_insert_placeholder_5, :db_insert_placeholder_6, :db_insert_placeholder_7, :db_insert_placeholder_8, :db_insert_placeholder_9, :db_insert_placeholder_10, :db_insert_placeholder_11, :db_insert_placeholder_12, :db_insert_placeholder_13) - Array ( [:db_insert_placeholder_0] => poll [:db_insert_placeholder_1] => Poll [:db_insert_placeholder_2] => poll [:db_insert_placeholder_3] => 1 [:db_insert_placeholder_4] => Question [:db_insert_placeholder_5] => [:db_insert_placeholder_6] => [:db_insert_placeholder_7] => A poll is a question with a set of possible responses. A poll, once created, automatically provides a simple running count of the number of votes received for each response. [:db_insert_placeholder_8] => [:db_insert_placeholder_9] => 0 [:db_insert_placeholder_10] => 0 [:db_insert_placeholder_11] => 0 [:db_insert_placeholder_12] => 1 [:db_insert_placeholder_13] => poll ) SQLSTATE[HY000]: General error: 1366 Incorrect integer value: '' for column 'has_body' at row 1 in /Applications/MAMP/htdocs/core/includes/database/database.inc on line 365

Trying without the patch...

Hm. Does not happen without this patch. Sorry, Peter. :(

I get this error when going to admin/build/modules and enabling all modules.

Without this patch I still get notices related to the registry, but nothing like this.

With this patch I get "Call to undefined function function _node_type_set_defaults()" when I enable book module.

I can't run all tests at the moment due to Fatal error: Class 'DatabaseLog' not found in /home/catch/www/7.x/includes/database/database.inc on line 769

Which fails in HEAD too.

however all the tests up to that one passed, and enabling every module on admin/build/modules worked fine. Since I incorrectly marked this rtbc last time, leaving open for one more double check.

Ok, this addresses all of my concerns. :)

Docs needed for this momentous occasion! http://drupal.org/node/224333

D'oh! Thanks Crell! I'm slackin'! :D

Thanks for the docs fix in D6. Committed.