coverage report stuff
This commit is contained in:
meus
parent
0ad03d6e2f
commit
0b24b4551e
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Collection.php 2990 2007-10-22 16:38:03Z zYne $
|
||||
<td class="normal"> * $Id: Collection.php 3075 2007-11-05 18:05:17Z nightfreak $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -100,7 +100,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @version $Revision: 2990 $
|
||||
<td class="normal"> * @version $Revision: 3075 $
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
@ -2356,6 +2356,33 @@
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>783</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>784</td>
|
||||
<td class="normal"> /**
|
||||
</td></tr>
|
||||
<tr><td>785</td>
|
||||
<td class="normal"> * returns the relation object
|
||||
</td></tr>
|
||||
<tr><td>786</td>
|
||||
<td class="normal"> * @return object Doctrine_Relation
|
||||
</td></tr>
|
||||
<tr><td>787</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>788</td>
|
||||
<td class="normal"> public function getRelation()
|
||||
</td></tr>
|
||||
<tr><td>789</td>
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>790</td>
|
||||
<td class="red"> return $this->relation;
|
||||
</td></tr>
|
||||
<tr><td>791</td>
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>792</td>
|
||||
<td class="normal">}
|
||||
</td></tr>
|
||||
</table></body></html>
|
||||
@ -193,10 +193,10 @@
|
||||
<td class="normal"> // and currently declared classes
|
||||
</td></tr>
|
||||
<tr><td>62</td>
|
||||
<td class="covered"> foreach ($loadedModels as $name) {
|
||||
<td class="covered"> foreach ($loadedModels as $className) {
|
||||
</td></tr>
|
||||
<tr><td>63</td>
|
||||
<td class="covered"> if ( ! empty($models) && !in_array($name, $models)) {
|
||||
<td class="covered"> if ( ! empty($models) && !in_array($className, $models)) {
|
||||
</td></tr>
|
||||
<tr><td>64</td>
|
||||
<td class="covered"> continue;
|
||||
@ -208,7 +208,7 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>67</td>
|
||||
<td class="covered"> $record = new $name();
|
||||
<td class="covered"> $record = new $className();
|
||||
</td></tr>
|
||||
<tr><td>68</td>
|
||||
<td class="covered"> $recordTable = $record->getTable();
|
||||
@ -226,182 +226,179 @@
|
||||
<td class="covered"> $table = array();
|
||||
</td></tr>
|
||||
<tr><td>73</td>
|
||||
<td class="covered"> $table['tableName'] = $data['tableName'];
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>74</td>
|
||||
<td class="covered"> $table['className'] = get_class($record);
|
||||
</td></tr>
|
||||
<tr><td>75</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>76</td>
|
||||
<td class="covered"> foreach ($data['columns'] AS $name => $column) {
|
||||
</td></tr>
|
||||
<tr><td>75</td>
|
||||
<td class="covered"> $data['columns'][$name]['type'] = $column['type'] . '(' . $column['length'] . ')';
|
||||
</td></tr>
|
||||
<tr><td>76</td>
|
||||
<td class="covered"> unset($data['columns'][$name]['length']);
|
||||
</td></tr>
|
||||
<tr><td>77</td>
|
||||
<td class="covered"> $data['columns'][$name]['name'] = $name;
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>78</td>
|
||||
<td class="covered"> }
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>79</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>80</td>
|
||||
<td class="covered"> $table['columns'] = $data['columns'];
|
||||
</td></tr>
|
||||
<tr><td>81</td>
|
||||
<tr><td>80</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>82</td>
|
||||
<tr><td>81</td>
|
||||
<td class="covered"> $relations = $recordTable->getRelations();
|
||||
</td></tr>
|
||||
<tr><td>83</td>
|
||||
<tr><td>82</td>
|
||||
<td class="covered"> foreach ($relations as $key => $relation) {
|
||||
</td></tr>
|
||||
<tr><td>84</td>
|
||||
<tr><td>83</td>
|
||||
<td class="covered"> $relationData = $relation->toArray();
|
||||
</td></tr>
|
||||
<tr><td>85</td>
|
||||
<tr><td>84</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>86</td>
|
||||
<tr><td>85</td>
|
||||
<td class="covered"> $relationKey = $relationData['alias'];
|
||||
</td></tr>
|
||||
<tr><td>87</td>
|
||||
<tr><td>86</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>88</td>
|
||||
<tr><td>87</td>
|
||||
<td class="covered"> if (isset($relationData['refTable']) && $relationData['refTable']) {
|
||||
</td></tr>
|
||||
<tr><td>89</td>
|
||||
<tr><td>88</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['refClass'] = $relationData['refTable']->getComponentName();
|
||||
</td></tr>
|
||||
<tr><td>90</td>
|
||||
<tr><td>89</td>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>90</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>91</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>92</td>
|
||||
<td class="covered"> if (isset($relationData['class']) && $relationData['class'] && $relation['class'] != $relationKey) {
|
||||
</td></tr>
|
||||
<tr><td>93</td>
|
||||
<tr><td>92</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['class'] = $relationData['class'];
|
||||
</td></tr>
|
||||
<tr><td>94</td>
|
||||
<tr><td>93</td>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>95</td>
|
||||
<tr><td>94</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>96</td>
|
||||
<tr><td>95</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['local'] = $relationData['local'];
|
||||
</td></tr>
|
||||
<tr><td>97</td>
|
||||
<tr><td>96</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['foreign'] = $relationData['foreign'];
|
||||
</td></tr>
|
||||
<tr><td>98</td>
|
||||
<tr><td>97</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>99</td>
|
||||
<tr><td>98</td>
|
||||
<td class="covered"> if ($relationData['type'] === Doctrine_Relation::ONE) {
|
||||
</td></tr>
|
||||
<tr><td>100</td>
|
||||
<tr><td>99</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['type'] = 'one';
|
||||
</td></tr>
|
||||
<tr><td>101</td>
|
||||
<tr><td>100</td>
|
||||
<td class="covered"> } else if($relationData['type'] === Doctrine_Relation::MANY) {
|
||||
</td></tr>
|
||||
<tr><td>102</td>
|
||||
<tr><td>101</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['type'] = 'many';
|
||||
</td></tr>
|
||||
<tr><td>103</td>
|
||||
<tr><td>102</td>
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>104</td>
|
||||
<tr><td>103</td>
|
||||
<td class="covered"> $table['relations'][$relationKey]['type'] = 'one';
|
||||
</td></tr>
|
||||
<tr><td>105</td>
|
||||
<tr><td>104</td>
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>106</td>
|
||||
<tr><td>105</td>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>107</td>
|
||||
<tr><td>106</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>108</td>
|
||||
<td class="covered"> $array[$table['className']] = $table;
|
||||
<tr><td>107</td>
|
||||
<td class="covered"> $array[$className] = $table;
|
||||
</td></tr>
|
||||
<tr><td>109</td>
|
||||
<tr><td>108</td>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>110</td>
|
||||
<tr><td>109</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>111</td>
|
||||
<tr><td>110</td>
|
||||
<td class="covered"> return $array;
|
||||
</td></tr>
|
||||
<tr><td>112</td>
|
||||
<tr><td>111</td>
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>113</td>
|
||||
<tr><td>112</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>114</td>
|
||||
<tr><td>113</td>
|
||||
<td class="normal"> /**
|
||||
</td></tr>
|
||||
<tr><td>115</td>
|
||||
<tr><td>114</td>
|
||||
<td class="normal"> * exportSchema
|
||||
</td></tr>
|
||||
<tr><td>116</td>
|
||||
<tr><td>115</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>117</td>
|
||||
<tr><td>116</td>
|
||||
<td class="normal"> * @param string $schema
|
||||
</td></tr>
|
||||
<tr><td>118</td>
|
||||
<tr><td>117</td>
|
||||
<td class="normal"> * @param string $directory
|
||||
</td></tr>
|
||||
<tr><td>119</td>
|
||||
<tr><td>118</td>
|
||||
<td class="normal"> * @return string $string of data in the specified format
|
||||
</td></tr>
|
||||
<tr><td>120</td>
|
||||
<tr><td>119</td>
|
||||
<td class="normal"> * @return void
|
||||
</td></tr>
|
||||
<tr><td>121</td>
|
||||
<tr><td>120</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>122</td>
|
||||
<tr><td>121</td>
|
||||
<td class="normal"> public function exportSchema($schema, $format = 'yml', $directory = null, $models = array())
|
||||
</td></tr>
|
||||
<tr><td>123</td>
|
||||
<tr><td>122</td>
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>124</td>
|
||||
<tr><td>123</td>
|
||||
<td class="covered"> $array = $this->buildSchema($directory, $models);
|
||||
</td></tr>
|
||||
<tr><td>125</td>
|
||||
<tr><td>124</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>126</td>
|
||||
<tr><td>125</td>
|
||||
<td class="covered"> if (is_dir($schema)) {
|
||||
</td></tr>
|
||||
<tr><td>127</td>
|
||||
<tr><td>126</td>
|
||||
<td class="red"> $schema = $schema . DIRECTORY_SEPARATOR . 'schema.' . $format;
|
||||
</td></tr>
|
||||
<tr><td>128</td>
|
||||
<tr><td>127</td>
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>129</td>
|
||||
<tr><td>128</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>130</td>
|
||||
<tr><td>129</td>
|
||||
<td class="covered"> return Doctrine_Parser::dump($array, $format, $schema);
|
||||
</td></tr>
|
||||
<tr><td>131</td>
|
||||
<tr><td>130</td>
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>132</td>
|
||||
<tr><td>131</td>
|
||||
<td class="covered">}</td></tr>
|
||||
</table></body></html>
|
||||
@ -316,7 +316,7 @@
|
||||
<td class="covered"> $array = array();
|
||||
</td></tr>
|
||||
<tr><td>103</td>
|
||||
<td class="normal">
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>104</td>
|
||||
<td class="covered"> foreach ((array) $schema AS $s) {
|
||||
@ -337,7 +337,7 @@
|
||||
<td class="red"> RecursiveIteratorIterator::LEAVES_ONLY);
|
||||
</td></tr>
|
||||
<tr><td>110</td>
|
||||
<td class="normal">
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>111</td>
|
||||
<td class="red"> foreach ($it as $file) {
|
||||
@ -364,13 +364,13 @@
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>119</td>
|
||||
<td class="normal">
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>120</td>
|
||||
<td class="covered"> $this->buildRelationships($array);
|
||||
</td></tr>
|
||||
<tr><td>121</td>
|
||||
<td class="normal">
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>122</td>
|
||||
<td class="covered"> return array('schema' => $array, 'relations' => $this->_relations);
|
||||
@ -670,31 +670,31 @@
|
||||
<td class="covered"> foreach ($all_relations as $relation) {
|
||||
</td></tr>
|
||||
<tr><td>221</td>
|
||||
<td class="red"> if (!in_array($relation['class'], $exist_relations)) {
|
||||
<td class="red"> if (!in_array($relation['class'], $exist_relations)) {
|
||||
</td></tr>
|
||||
<tr><td>222</td>
|
||||
<td class="red"> $exist_relations[] = $relation['class'];
|
||||
<td class="red"> $exist_relations[] = $relation['class'];
|
||||
</td></tr>
|
||||
<tr><td>223</td>
|
||||
<td class="red"> $unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
|
||||
<td class="red"> $unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
|
||||
</td></tr>
|
||||
<tr><td>224</td>
|
||||
<td class="red"> } else {
|
||||
<td class="red"> } else {
|
||||
</td></tr>
|
||||
<tr><td>225</td>
|
||||
<td class="normal"> // check to see if this relationship is not autogenerated, if it's not, then the user must have explicitly declared it
|
||||
<td class="normal"> // check to see if this relationship is not autogenerated, if it's not, then the user must have explicitly declared it
|
||||
</td></tr>
|
||||
<tr><td>226</td>
|
||||
<td class="red"> if (!isset($relation['autogenerated']) || $relation['autogenerated'] != true) {
|
||||
<td class="red"> if (!isset($relation['autogenerated']) || $relation['autogenerated'] != true) {
|
||||
</td></tr>
|
||||
<tr><td>227</td>
|
||||
<td class="red"> $unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
|
||||
<td class="red"> $unique_relations = array_merge($unique_relations, array($relation['alias'] => $relation));
|
||||
</td></tr>
|
||||
<tr><td>228</td>
|
||||
<td class="red"> }
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>229</td>
|
||||
<td class="normal"> }
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>230</td>
|
||||
<td class="red"> }
|
||||
@ -976,7 +976,7 @@
|
||||
<td class="covered"> $colDesc = array();
|
||||
</td></tr>
|
||||
<tr><td>323</td>
|
||||
<td class="covered"> $colDesc['name'] = isset($field['name']) ? (string) $field['name']:$columnName;
|
||||
<td class="covered"> $colDesc['name'] = $columnName;
|
||||
</td></tr>
|
||||
<tr><td>324</td>
|
||||
<td class="normal">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Record.php 3037 2007-10-29 23:34:10Z zYne $
|
||||
<td class="normal"> * $Id: Record.php 3079 2007-11-07 15:38:20Z romanb $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -103,7 +103,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> * @version $Revision: 3037 $
|
||||
<td class="normal"> * @version $Revision: 3079 $
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> */
|
||||
@ -3166,7 +3166,7 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>1053</td>
|
||||
<td class="red"> return $conn->replace($this->_table->getTableName(), $this->getPrepared(), $this->id);
|
||||
<td class="red"> return $conn->replace($this->_table->getTableName(), $this->getPrepared(), $this->_id);
|
||||
</td></tr>
|
||||
<tr><td>1054</td>
|
||||
<td class="orange"> }
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user