diff --git a/project_dependency.drupal.inc b/project_dependency.drupal.inc index 0404ec2..63f0833 100644 --- a/project_dependency.drupal.inc +++ b/project_dependency.drupal.inc @@ -99,10 +99,10 @@ function project_dependency_info_releases_for_component_get($component, $api_tid FROM {project_dependency_component} c INNER JOIN {project_release_nodes} prn ON c.release_nid = prn.nid LEFT JOIN {project_projects} pp ON prn.pid = pp.nid - INNER JOIN {term_node} t ON c.release_nid = t.nid - WHERE t.tid = %d AND c.name = '%s' + INNER JOIN {taxonomy_term_node} t ON c.release_nid = t.nid + WHERE t.tid = :t.tid AND c.name = :c.name ORDER BY prn.nid DESC, t.vid DESC - ", $api_tid, $component); + ", array(':t.tid' => $api_tid, ':c.name' => $component)); $releases = array(); while ($release = db_fetch_array($result)) { @@ -203,11 +203,17 @@ function project_dependency_info_parse_dependency($dependency, $core_api) { } // Equivalence can be checked by adding two restrictions. if ($op == '=' || $op == '==') { - $value['versions'][] = array('op' => '<', 'version' => ($matches['major'] + 1) . '.x'); + $value['versions'][] = array( + 'op' => '<', + 'version' => ($matches['major'] + 1) . '.x', + ); $op = '>='; } } - $value['versions'][] = array('op' => $op, 'version' => $matches['major'] . '.' . $matches['minor']); + $value['versions'][] = array( + 'op' => $op, + 'version' => $matches['major'] . '.' . $matches['minor'], + ); } } } @@ -294,12 +300,12 @@ function project_dependency_info_batch_process_release(array $release) { // "WD php: Warning: ereg(): REG_ERANGE in file_scan_directory()" // $function_pattern = DRUPAL_PHP_FUNCTION_PATTERN; $function_pattern = '[a-zA-Z][a-zA-Z0-9_]*'; - $profile_info_files = file_scan_directory(PROJECT_DEPENDENCY_SOURCECODE_DIRECTORY . '/' . $directory, '^' . $function_pattern . '\.(theme|profile)$'); + $profile_info_files = file_scan_directory(PROJECT_DEPENDENCY_SOURCECODE_DIRECTORY . '/' . $directory, '/^' . $function_pattern . '\.(theme|profile)$/'); // If any profile or theme files are found, skip this release entirely. if (!empty($profile_info_files)) { return FALSE; } - $files = file_scan_directory(PROJECT_DEPENDENCY_SOURCECODE_DIRECTORY . '/' . $directory, '^' . $function_pattern . '\.info$'); + $files = file_scan_directory(PROJECT_DEPENDENCY_SOURCECODE_DIRECTORY . '/' . $directory, '/^' . $function_pattern . '\.info$/'); $info_files = array(); foreach ($files as $file) { $info_files[] = $file->filename; @@ -347,7 +353,7 @@ function project_dependency_process_release($shortname, $version) { // Load the project. $pid = project_get_nid_from_uri($shortname); $query = 'SELECT nid,tag FROM {project_release_nodes} WHERE pid = %d AND version = "%s"'; - $release = db_fetch_array(db_query($query, $pid, $version)); + $release = db_fetch_array(db_query('SELECT nid,tag FROM {project_release_nodes} WHERE pid = :pid AND version = :version', array(':pid' => $pid, ':version' => $version))); $release['uri'] = $shortname; $node = node_load($release['nid']); @@ -419,7 +425,7 @@ function project_dependency_get_external_component_dependencies($release_nid, $d // components in this release. if (empty($depending_components)) { $query = 'SELECT name FROM {project_dependency_component} WHERE release_nid = %d'; - $result = db_query($query, $release_nid); + $result = db_query('SELECT name FROM {project_dependency_component} WHERE release_nid = :release_nid', array(':release_nid' => $release_nid)); while ($row = db_fetch_array($result)) { $depending_components[] = $row['name']; } @@ -487,8 +493,9 @@ function project_dependency_find_external_dependencies($release_nid, $component_ $rows = array(); $query = 'SELECT DISTINCT(pdc.component_id), name AS depender, dependency, release_nid FROM {project_dependency_dependency} pdd INNER JOIN {project_dependency_component} pdc ON pdd.component_id = pdc.component_id WHERE pdc.name = "%s" AND pdc.release_nid = %d'; - $result = db_query($query, $component_name, $release_nid); - while($row = db_fetch_array($result)) { + $result = db_query('SELECT DISTINCT(pdc.component_id), name AS depender, dependency, release_nid FROM {project_dependency_dependency} pdd INNER JOIN {project_dependency_component} pdc + ON pdd.component_id = pdc.component_id WHERE pdc.name = :pdc.name AND pdc.release_nid = :pdc.release_nid', array(':pdc.name' => $component_name, ':pdc.release_nid' => $release_nid)); + while ($row = db_fetch_array($result)) { $rows[] = $row; } return $rows; diff --git a/project_dependency.drush.inc b/project_dependency.drush.inc index 29891f2..3936c48 100644 --- a/project_dependency.drush.inc +++ b/project_dependency.drush.inc @@ -66,7 +66,7 @@ function drush_project_dependency_process_project() { // Find all releases for a project. $query = 'SELECT nid,tag,version FROM {project_release_nodes} WHERE pid = %d ORDER BY nid DESC'; - $result = db_query($query, $pid); + $result = db_query('SELECT nid,tag,version FROM {project_release_nodes} WHERE pid = :pid ORDER BY nid DESC', array(':pid' => $pid)); while ($release_info = db_fetch_array($result)) { $dependencies = project_dependency_process_release($shortname, $release_info['version']); if ($dependencies === FALSE) { @@ -108,7 +108,7 @@ function drush_project_dependency_process_all_projects() { ini_set('memory_limit', -1); module_load_include('inc', 'project_dependency', 'project_dependency.drupal'); - $total = $to_do = db_result(db_query('SELECT COUNT(*) FROM {project_release_nodes}')); + $total = $to_do = db_query('SELECT COUNT(*) FROM {project_release_nodes}')->fetchField(); $done = 0; $query = 'SELECT prn.nid, prn.version, p.uri AS shortname FROM {project_release_nodes} prn INNER JOIN {project_projects} p ON p.nid = prn.pid ORDER BY shortname, version'; @@ -119,7 +119,7 @@ function drush_project_dependency_process_all_projects() { if ($dependencies === FALSE) { $skipped++; } - $pct = round($done * 100/$total, 2); + $pct = round($done * 100 / $total, 2); drush_print("$pct% done. Done: $done; Skipped: $skipped; Remaining: $to_do ({$release_info['shortname']}:{$release_info['version']} nid={$release_info['nid']})"); $done++; $to_do--; @@ -139,7 +139,7 @@ function drush_project_show_dependencies($shortname, $version) { // Find the release nid for the given shortname + version $pid = project_get_nid_from_uri($shortname); - $nid = db_result(db_query('SELECT nid FROM {project_release_nodes} WHERE pid = %d AND version = "%s"', $pid, $version)); + $nid = db_query('SELECT nid FROM {project_release_nodes} WHERE pid = :pid AND version = :version', array(':pid' => $pid, ':version' => $version))->fetchField(); if (empty($nid)) { drush_print_r("Failed to load a release for $shortname:$version"); return; diff --git a/project_dependency.info b/project_dependency.info index 374ab86..e30be1f 100644 --- a/project_dependency.info +++ b/project_dependency.info @@ -4,6 +4,8 @@ package = Project dependencies[] = project dependencies[] = project_release dependencies[] = taxonomy -core = 6.x +core = 7.x test_dependencies[] = pift + +files[] = tests/project_dependency.test diff --git a/project_dependency.install b/project_dependency.install index 1f6469a..beefc19 100644 --- a/project_dependency.install +++ b/project_dependency.install @@ -1,16 +1,28 @@ array( 'description' => 'A description of a component.', 'type' => 'text', - 'size' => 'medium' + 'size' => 'medium', ), ), 'primary key' => array('component_id'), @@ -90,7 +102,7 @@ function project_dependency_schema() { 'core_api' => array( 'type' => 'varchar', 'length' => 8, - 'description' => t('The core api version of this component, as in "6.x" or "7.x".'), + 'description' => 'The core api version of this component, as in "6.x" or "7.x".', 'not null' => TRUE, ), 'external' => array( diff --git a/project_dependency.module b/project_dependency.module index a2e9099..f3d4386 100644 --- a/project_dependency.module +++ b/project_dependency.module @@ -34,7 +34,7 @@ function project_dependency_project_release_create_package($project_node, $relea * Array of component information. */ function project_dependency_component_load($component_id) { - return db_fetch_array(db_query('SELECT * FROM {project_dependency_component} WHERE component_id = %d', $component_id)); + return db_fetch_array(db_query('SELECT * FROM {project_dependency_component} WHERE component_id = :component_id', array(':component_id' => $component_id))); } /** @@ -48,7 +48,7 @@ function project_dependency_component_load($component_id) { * array keys: 'name', 'title', 'description'. */ function project_dependency_get_components($release_nid) { - $result = db_query('SELECT * FROM {project_dependency_component} WHERE release_nid = %d', $release_nid); + $result = db_query('SELECT * FROM {project_dependency_component} WHERE release_nid = :release_nid', array(':release_nid' => $release_nid)); $components = array(); while ($component = db_fetch_array($result)) { $components[$component['name']] = $component; @@ -73,8 +73,8 @@ function project_dependency_component_dependencies_load_all($component_id, $depe FROM {project_dependency_dependency} d JOIN {project_dependency_component} c ON c.component_id = d.component_id - WHERE c.component_id = %d - AND dependency_type <= %d', $component_id, $dependency_type); + WHERE c.component_id = :c.component_id + AND dependency_type <= :dependency_type', array(':c.component_id' => $component_id, ':dependency_type' => $dependency_type)); $dependencies = array(); while ($dependency = db_fetch_array($result)) { $dependencies[$dependency['name']] = $dependency; diff --git a/project_dependency.package.inc b/project_dependency.package.inc index 3f4d2e5..eed054d 100644 --- a/project_dependency.package.inc +++ b/project_dependency.package.inc @@ -14,10 +14,18 @@ * The project release ID. */ function project_dependency_info_package_clear($release_nid) { - db_query('DELETE FROM {project_dependency_dependency} - WHERE component_id IN (SELECT component_id FROM {project_dependency_component} WHERE release_nid = %d)', $release_nid); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query('DELETE FROM {project_dependency_dependency} + WHERE component_id IN (SELECT component_id FROM {project_dependency_component} WHERE release_nid = %d)', $release_nid) */ + db_delete('project_dependency_dependency') + ->where('component_id IN (SELECT component_id FROM {project_dependency_component} WHERE release_nid = %d)', ) + ->execute(); - db_query('DELETE FROM {project_dependency_component} WHERE release_nid = %d', $release_nid); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query('DELETE FROM {project_dependency_component} WHERE release_nid = %d', $release_nid) */ + db_delete('project_dependency_component') + ->condition('release_nid', $release_nid) + ->execute(); } /** @@ -68,7 +76,7 @@ function project_dependency_info_package_dependencies_store($release_nid, $compo $release = node_load($release_nid); $api_term = project_dependency_info_core_api($release); - foreach($dependencies as $dependency => $attributes) { + foreach ($dependencies as $dependency => $attributes) { $record = array( 'component_id' => $component_id, 'dependency' => $dependency, diff --git a/tests/bar/baz/project_release_baz.info b/tests/bar/baz/project_release_baz.info index b0a1806..ae8638c 100644 --- a/tests/bar/baz/project_release_baz.info +++ b/tests/bar/baz/project_release_baz.info @@ -6,3 +6,4 @@ core = 7.x dependencies[] = project_dependency_bar test_dependencies[] = project_dependency_foo (1.x) + diff --git a/tests/bar/project_release_bar.info b/tests/bar/project_release_bar.info index 66c2623..40c131f 100644 --- a/tests/bar/project_release_bar.info +++ b/tests/bar/project_release_bar.info @@ -6,3 +6,4 @@ core = 7.x dependencies[] = project_dependency_foo test_dependencies[] = project_dependency_baz + diff --git a/tests/foo/project_release_foo.info b/tests/foo/project_release_foo.info index caaf861..8416fa4 100644 --- a/tests/foo/project_release_foo.info +++ b/tests/foo/project_release_foo.info @@ -3,3 +3,4 @@ description = Test module for project_dependency. (do not enable) package = Project version = 1.0 core = 7.x + diff --git a/tests/project_dependency.test b/tests/project_dependency.test index 413cd41..af81a66 100644 --- a/tests/project_dependency.test +++ b/tests/project_dependency.test @@ -159,16 +159,16 @@ class ProjectReleaseComponentDrupalTestCase extends ProjectDrupalOrgWebTestCase // Ensure that parsing creates an error due to the lack of a stable release. $this->assertPackageError('ERROR: No development release with a corresponding stable release was found that matches the requirements for dependency [project_dependency_foo] of [project_dependency_bar].'); - // @TODO Figure out what CVS/Version control API stuff needs to be in setup. + // @TODO Figure out what CVS/Version control API stuff needs to be in setup. // $this->createTag('bar', 'DRUPAL-7--1-0'); // $this->drupalPost('node/add/project-release/' . $this->projects['bar']->nid, array(), t('Next')); // $edit = array( // 'body' => $this->randomString(32), // ); // $this->drupalPost(NULL, $edit, t('Save')); -// + // // $this->process(); -// + // // $this->assertNoPackageErrors(); } @@ -177,8 +177,14 @@ class ProjectReleaseComponentDrupalTestCase extends ProjectDrupalOrgWebTestCase */ protected function process() { // Remove all previously existing project_dependency_info data. - db_query('DELETE FROM {project_dependency_dependency}'); - db_query('DELETE FROM {project_dependency_component}'); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query('DELETE FROM {project_dependency_dependency}') */ + db_delete('project_dependency_dependency') + ->execute(); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query('DELETE FROM {project_dependency_component}') */ + db_delete('project_dependency_component') + ->execute(); // Reset packaging errors. wd_err(FALSE, TRUE); @@ -200,7 +206,9 @@ class ProjectReleaseComponentDrupalTestCase extends ProjectDrupalOrgWebTestCase } protected function createTag($project, $tag, $branch = FALSE) { - db_query("INSERT INTO {cvs_tags} VALUES (%d, '%s', %d, %d)", $this->projects[$project]->nid, $tag, $branch ? 1 : 0, time()); + // TODO Please convert this statement to the D7 database API syntax. + /* db_query("INSERT INTO {cvs_tags} VALUES (%d, '%s', %d, %d)", $this->projects[$project]->nid, $tag, $branch ? 1 : 0, REQUEST_TIME) */ + NULL; } /**