added a convenience method and new coverage stuff
This commit is contained in:
parent
ea4561fb61
commit
79e52571aa
@ -650,6 +650,19 @@ final class Doctrine
|
||||
return Doctrine_Manager::connection()->export->exportSchema($directory);
|
||||
}
|
||||
|
||||
/**
|
||||
* createTablesFromArray
|
||||
*
|
||||
* Creates database tables for the models in the supplied array
|
||||
*
|
||||
* @param array $array An array of models to be exported
|
||||
* @return void
|
||||
*/
|
||||
public static function createTablesFromArray($array)
|
||||
{
|
||||
return Doctrine_Manager::connection()->export->exportClasses($array);
|
||||
}
|
||||
|
||||
/**
|
||||
* generateSqlFromModels
|
||||
*
|
||||
|
File diff suppressed because it is too large
Load Diff
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: Connection.php 3008 2007-10-25 16:02:00Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Connection.php 3040 2007-10-30 17:51:33Z gnat $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -163,7 +163,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>52</td>
|
||||
<td class="normal"> * @version $Revision: 3008 $
|
||||
<td class="normal"> * @version $Revision: 3040 $
|
||||
</td></tr>
|
||||
<tr><td>53</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
@ -703,7 +703,7 @@
|
||||
<td class="covered"> if ( ! isset($this->attributes[$attribute])) {
|
||||
</td></tr>
|
||||
<tr><td>232</td>
|
||||
<td class="covered"> return $this->parent->getAttribute($attribute);
|
||||
<td class="covered"> return parent::getAttribute($attribute);
|
||||
</td></tr>
|
||||
<tr><td>233</td>
|
||||
<td class="orange"> }
|
||||
@ -2608,16 +2608,16 @@
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>867</td>
|
||||
<td class="covered"> } catch(Doctrine_Adapter_Exception $e) {
|
||||
<td class="orange"> } catch(Doctrine_Adapter_Exception $e) {
|
||||
</td></tr>
|
||||
<tr><td>868</td>
|
||||
<td class="covered"> } catch(PDOException $e) { }
|
||||
<td class="orange"> } catch(PDOException $e) { }
|
||||
</td></tr>
|
||||
<tr><td>869</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>870</td>
|
||||
<td class="covered"> $this->rethrowException($e, $this);
|
||||
<td class="orange"> $this->rethrowException($e, $this);
|
||||
</td></tr>
|
||||
<tr><td>871</td>
|
||||
<td class="orange"> }
|
||||
|
@ -3142,7 +3142,7 @@
|
||||
<td class="covered"> $models = Doctrine::loadModels($directory);
|
||||
</td></tr>
|
||||
<tr><td>1045</td>
|
||||
<td class="red"> } else {
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>1046</td>
|
||||
<td class="red"> $models = Doctrine::getLoadedModels();
|
||||
@ -3154,10 +3154,10 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>1049</td>
|
||||
<td class="red"> $this->exportClasses($models);
|
||||
<td class="covered"> $this->exportClasses($models);
|
||||
</td></tr>
|
||||
<tr><td>1050</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>1051</td>
|
||||
<td class="normal">
|
||||
@ -3739,5 +3739,6 @@
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>1244</td>
|
||||
<td class="covered">}</td></tr>
|
||||
<td class="normal">}
|
||||
</td></tr>
|
||||
</table></body></html>
|
File diff suppressed because it is too large
Load Diff
@ -463,19 +463,19 @@
|
||||
<td class="covered"> if (isset($options['charset'])) {
|
||||
</td></tr>
|
||||
<tr><td>152</td>
|
||||
<td class="red"> $optionStrings['charset'] = 'DEFAULT CHARACTER SET ' . $options['charset'];
|
||||
<td class="covered"> $optionStrings['charset'] = 'DEFAULT CHARACTER SET ' . $options['charset'];
|
||||
</td></tr>
|
||||
<tr><td>153</td>
|
||||
<td class="red"> if (isset($options['collate'])) {
|
||||
<td class="covered"> if (isset($options['collate'])) {
|
||||
</td></tr>
|
||||
<tr><td>154</td>
|
||||
<td class="red"> $optionStrings['charset'] .= ' COLLATE ' . $options['collate'];
|
||||
<td class="covered"> $optionStrings['charset'] .= ' COLLATE ' . $options['collate'];
|
||||
</td></tr>
|
||||
<tr><td>155</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>156</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>157</td>
|
||||
<td class="normal">
|
||||
|
@ -154,7 +154,7 @@
|
||||
<td class="covered"> $loadedModels = Doctrine::loadModels($directory);
|
||||
</td></tr>
|
||||
<tr><td>49</td>
|
||||
<td class="red"> } else {
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>50</td>
|
||||
<td class="red"> $loadedModels = Doctrine::getLoadedModels();
|
||||
@ -166,22 +166,22 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>53</td>
|
||||
<td class="red"> $array = array();
|
||||
<td class="covered"> $array = array();
|
||||
</td></tr>
|
||||
<tr><td>54</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>55</td>
|
||||
<td class="red"> $parent = new ReflectionClass('Doctrine_Record');
|
||||
<td class="covered"> $parent = new ReflectionClass('Doctrine_Record');
|
||||
</td></tr>
|
||||
<tr><td>56</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>57</td>
|
||||
<td class="red"> $sql = array();
|
||||
<td class="covered"> $sql = array();
|
||||
</td></tr>
|
||||
<tr><td>58</td>
|
||||
<td class="red"> $fks = array();
|
||||
<td class="covered"> $fks = array();
|
||||
</td></tr>
|
||||
<tr><td>59</td>
|
||||
<td class="normal">
|
||||
@ -193,13 +193,13 @@
|
||||
<td class="normal"> // and currently declared classes
|
||||
</td></tr>
|
||||
<tr><td>62</td>
|
||||
<td class="red"> foreach ($loadedModels as $name) {
|
||||
<td class="covered"> foreach ($loadedModels as $name) {
|
||||
</td></tr>
|
||||
<tr><td>63</td>
|
||||
<td class="red"> if ( ! empty($models) && !in_array($name, $models)) {
|
||||
<td class="covered"> if ( ! empty($models) && !in_array($name, $models)) {
|
||||
</td></tr>
|
||||
<tr><td>64</td>
|
||||
<td class="red"> continue;
|
||||
<td class="covered"> continue;
|
||||
</td></tr>
|
||||
<tr><td>65</td>
|
||||
<td class="orange"> }
|
||||
@ -208,139 +208,139 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>67</td>
|
||||
<td class="red"> $record = new $name();
|
||||
<td class="covered"> $record = new $name();
|
||||
</td></tr>
|
||||
<tr><td>68</td>
|
||||
<td class="red"> $recordTable = $record->getTable();
|
||||
<td class="covered"> $recordTable = $record->getTable();
|
||||
</td></tr>
|
||||
<tr><td>69</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>70</td>
|
||||
<td class="red"> $data = $recordTable->getExportableFormat();
|
||||
<td class="covered"> $data = $recordTable->getExportableFormat();
|
||||
</td></tr>
|
||||
<tr><td>71</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>72</td>
|
||||
<td class="red"> $table = array();
|
||||
<td class="covered"> $table = array();
|
||||
</td></tr>
|
||||
<tr><td>73</td>
|
||||
<td class="red"> $table['tableName'] = $data['tableName'];
|
||||
<td class="covered"> $table['tableName'] = $data['tableName'];
|
||||
</td></tr>
|
||||
<tr><td>74</td>
|
||||
<td class="red"> $table['className'] = get_class($record);
|
||||
<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="red"> foreach ($data['columns'] AS $name => $column) {
|
||||
<td class="covered"> foreach ($data['columns'] AS $name => $column) {
|
||||
</td></tr>
|
||||
<tr><td>77</td>
|
||||
<td class="red"> $data['columns'][$name]['name'] = $name;
|
||||
<td class="covered"> $data['columns'][$name]['name'] = $name;
|
||||
</td></tr>
|
||||
<tr><td>78</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>79</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>80</td>
|
||||
<td class="red"> $table['columns'] = $data['columns'];
|
||||
<td class="covered"> $table['columns'] = $data['columns'];
|
||||
</td></tr>
|
||||
<tr><td>81</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>82</td>
|
||||
<td class="red"> $relations = $recordTable->getRelations();
|
||||
<td class="covered"> $relations = $recordTable->getRelations();
|
||||
</td></tr>
|
||||
<tr><td>83</td>
|
||||
<td class="red"> foreach ($relations as $key => $relation) {
|
||||
<td class="covered"> foreach ($relations as $key => $relation) {
|
||||
</td></tr>
|
||||
<tr><td>84</td>
|
||||
<td class="red"> $relationData = $relation->toArray();
|
||||
<td class="covered"> $relationData = $relation->toArray();
|
||||
</td></tr>
|
||||
<tr><td>85</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>86</td>
|
||||
<td class="red"> $relationKey = $relationData['alias'];
|
||||
<td class="covered"> $relationKey = $relationData['alias'];
|
||||
</td></tr>
|
||||
<tr><td>87</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>88</td>
|
||||
<td class="red"> if (isset($relationData['refTable']) && $relationData['refTable']) {
|
||||
<td class="covered"> if (isset($relationData['refTable']) && $relationData['refTable']) {
|
||||
</td></tr>
|
||||
<tr><td>89</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['refClass'] = $relationData['refTable']->getComponentName();
|
||||
<td class="covered"> $table['relations'][$relationKey]['refClass'] = $relationData['refTable']->getComponentName();
|
||||
</td></tr>
|
||||
<tr><td>90</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>91</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>92</td>
|
||||
<td class="red"> if (isset($relationData['class']) && $relationData['class'] && $relation['class'] != $relationKey) {
|
||||
<td class="covered"> if (isset($relationData['class']) && $relationData['class'] && $relation['class'] != $relationKey) {
|
||||
</td></tr>
|
||||
<tr><td>93</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['class'] = $relationData['class'];
|
||||
<td class="covered"> $table['relations'][$relationKey]['class'] = $relationData['class'];
|
||||
</td></tr>
|
||||
<tr><td>94</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>95</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>96</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['local'] = $relationData['local'];
|
||||
<td class="covered"> $table['relations'][$relationKey]['local'] = $relationData['local'];
|
||||
</td></tr>
|
||||
<tr><td>97</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['foreign'] = $relationData['foreign'];
|
||||
<td class="covered"> $table['relations'][$relationKey]['foreign'] = $relationData['foreign'];
|
||||
</td></tr>
|
||||
<tr><td>98</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>99</td>
|
||||
<td class="red"> if ($relationData['type'] === Doctrine_Relation::ONE) {
|
||||
<td class="covered"> if ($relationData['type'] === Doctrine_Relation::ONE) {
|
||||
</td></tr>
|
||||
<tr><td>100</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['type'] = 'one';
|
||||
<td class="covered"> $table['relations'][$relationKey]['type'] = 'one';
|
||||
</td></tr>
|
||||
<tr><td>101</td>
|
||||
<td class="red"> } else if($relationData['type'] === Doctrine_Relation::MANY) {
|
||||
<td class="covered"> } else if($relationData['type'] === Doctrine_Relation::MANY) {
|
||||
</td></tr>
|
||||
<tr><td>102</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['type'] = 'many';
|
||||
<td class="covered"> $table['relations'][$relationKey]['type'] = 'many';
|
||||
</td></tr>
|
||||
<tr><td>103</td>
|
||||
<td class="red"> } else {
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>104</td>
|
||||
<td class="red"> $table['relations'][$relationKey]['type'] = 'one';
|
||||
<td class="covered"> $table['relations'][$relationKey]['type'] = 'one';
|
||||
</td></tr>
|
||||
<tr><td>105</td>
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>106</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>107</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>108</td>
|
||||
<td class="red"> $array[$table['className']] = $table;
|
||||
<td class="covered"> $array[$table['className']] = $table;
|
||||
</td></tr>
|
||||
<tr><td>109</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>110</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>111</td>
|
||||
<td class="red"> return $array;
|
||||
<td class="covered"> return $array;
|
||||
</td></tr>
|
||||
<tr><td>112</td>
|
||||
<td class="orange"> }
|
||||
@ -385,7 +385,7 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>126</td>
|
||||
<td class="red"> if (is_dir($schema)) {
|
||||
<td class="covered"> if (is_dir($schema)) {
|
||||
</td></tr>
|
||||
<tr><td>127</td>
|
||||
<td class="red"> $schema = $schema . DIRECTORY_SEPARATOR . 'schema.' . $format;
|
||||
@ -397,7 +397,7 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>130</td>
|
||||
<td class="red"> return Doctrine_Parser::dump($array, $format, $schema);
|
||||
<td class="covered"> return Doctrine_Parser::dump($array, $format, $schema);
|
||||
</td></tr>
|
||||
<tr><td>131</td>
|
||||
<td class="orange"> }
|
||||
|
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Sqlite.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Sqlite.php 3048 2007-11-01 19:45:36Z Jonathan.Wage $
|
||||
</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: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3048 $
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> */
|
||||
@ -1147,10 +1147,10 @@
|
||||
<td class="covered"> if ( ! empty($changes['change']) && is_array($changes['change'])) {
|
||||
</td></tr>
|
||||
<tr><td>380</td>
|
||||
<td class="covered"> foreach ($changes['change'] as $fieldName => $field) {
|
||||
<td class="red"> foreach ($changes['change'] as $fieldName => $field) {
|
||||
</td></tr>
|
||||
<tr><td>381</td>
|
||||
<td class="covered"> if ($query) {
|
||||
<td class="red"> if ($query) {
|
||||
</td></tr>
|
||||
<tr><td>382</td>
|
||||
<td class="red"> $query.= ', ';
|
||||
@ -1159,7 +1159,7 @@
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>384</td>
|
||||
<td class="covered"> if (isset($rename[$fieldName])) {
|
||||
<td class="red"> if (isset($rename[$fieldName])) {
|
||||
</td></tr>
|
||||
<tr><td>385</td>
|
||||
<td class="red"> $oldFieldName = $rename[$fieldName];
|
||||
@ -1171,25 +1171,25 @@
|
||||
<td class="red"> } else {
|
||||
</td></tr>
|
||||
<tr><td>388</td>
|
||||
<td class="covered"> $oldFieldName = $fieldName;
|
||||
<td class="red"> $oldFieldName = $fieldName;
|
||||
</td></tr>
|
||||
<tr><td>389</td>
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>390</td>
|
||||
<td class="covered"> $oldFieldName = $this->conn->quoteIdentifier($oldFieldName, true);
|
||||
<td class="red"> $oldFieldName = $this->conn->quoteIdentifier($oldFieldName, true);
|
||||
</td></tr>
|
||||
<tr><td>391</td>
|
||||
<td class="covered"> $query .= 'CHANGE ' . $oldFieldName . ' '
|
||||
<td class="red"> $query .= 'CHANGE ' . $oldFieldName . ' '
|
||||
</td></tr>
|
||||
<tr><td>392</td>
|
||||
<td class="covered"> . $this->getDeclaration($fieldName, $field['definition']);
|
||||
<td class="red"> . $this->getDeclaration($fieldName, $field['definition']);
|
||||
</td></tr>
|
||||
<tr><td>393</td>
|
||||
<td class="covered"> }
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>394</td>
|
||||
<td class="covered"> }
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>395</td>
|
||||
<td class="normal">
|
||||
@ -1255,5 +1255,6 @@
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>416</td>
|
||||
<td class="covered">}</td></tr>
|
||||
<td class="normal">}
|
||||
</td></tr>
|
||||
</table></body></html>
|
@ -694,5 +694,41 @@
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>229</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>230</td>
|
||||
<td class="normal"> /**
|
||||
</td></tr>
|
||||
<tr><td>231</td>
|
||||
<td class="normal"> * adds table name formatting to a table name
|
||||
</td></tr>
|
||||
<tr><td>232</td>
|
||||
<td class="normal"> *
|
||||
</td></tr>
|
||||
<tr><td>233</td>
|
||||
<td class="normal"> * @param string name of the table
|
||||
</td></tr>
|
||||
<tr><td>234</td>
|
||||
<td class="normal"> * @return string formatted table name
|
||||
</td></tr>
|
||||
<tr><td>235</td>
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>236</td>
|
||||
<td class="normal"> public function getTableName($table)
|
||||
</td></tr>
|
||||
<tr><td>237</td>
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>238</td>
|
||||
<td class="covered"> return sprintf($this->conn->getAttribute(Doctrine::ATTR_TBLNAME_FORMAT),
|
||||
</td></tr>
|
||||
<tr><td>239</td>
|
||||
<td class="covered"> preg_replace('/[^a-z0-9_\$]/i', '_', $table));
|
||||
</td></tr>
|
||||
<tr><td>240</td>
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>241</td>
|
||||
<td class="covered">}</td></tr>
|
||||
</table></body></html>
|
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Import.php 2963 2007-10-21 06:23:59Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Import.php 3062 2007-11-01 23:54:27Z Jonathan.Wage $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -106,7 +106,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> * @version $Revision: 2963 $
|
||||
<td class="normal"> * @version $Revision: 3062 $
|
||||
</td></tr>
|
||||
<tr><td>34</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
@ -604,7 +604,7 @@
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>199</td>
|
||||
<td class="normal"> public function importSchema($directory, array $databases = array())
|
||||
<td class="normal"> public function importSchema($directory, array $databases = array(), array $options = array())
|
||||
</td></tr>
|
||||
<tr><td>200</td>
|
||||
<td class="normal"> {
|
||||
@ -640,10 +640,10 @@
|
||||
<td class="red"> $builder = new Doctrine_Import_Builder();
|
||||
</td></tr>
|
||||
<tr><td>211</td>
|
||||
<td class="red"> $builder->generateBaseClasses(true);
|
||||
<td class="red"> $builder->setTargetPath($directory);
|
||||
</td></tr>
|
||||
<tr><td>212</td>
|
||||
<td class="red"> $builder->setTargetPath($directory);
|
||||
<td class="red"> $builder->setOptions($options);
|
||||
</td></tr>
|
||||
<tr><td>213</td>
|
||||
<td class="normal">
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -544,28 +544,28 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>179</td>
|
||||
<td class="red"> $conn = Doctrine_Manager::connection();
|
||||
<td class="covered"> $conn = Doctrine_Manager::connection();
|
||||
</td></tr>
|
||||
<tr><td>180</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>181</td>
|
||||
<td class="red"> if ($this->hasMigrated()) {
|
||||
<td class="covered"> if ($this->hasMigrated()) {
|
||||
</td></tr>
|
||||
<tr><td>182</td>
|
||||
<td class="red"> $conn->exec("UPDATE " . $this->_migrationTableName . " SET version = $number");
|
||||
<td class="covered"> $conn->exec("UPDATE " . $this->_migrationTableName . " SET version = $number");
|
||||
</td></tr>
|
||||
<tr><td>183</td>
|
||||
<td class="red"> } else {
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>184</td>
|
||||
<td class="red"> $conn->exec("INSERT INTO " . $this->_migrationTableName . " (version) VALUES ($number)");
|
||||
<td class="covered"> $conn->exec("INSERT INTO " . $this->_migrationTableName . " (version) VALUES ($number)");
|
||||
</td></tr>
|
||||
<tr><td>185</td>
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>186</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>187</td>
|
||||
<td class="normal">
|
||||
@ -646,19 +646,19 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>213</td>
|
||||
<td class="red"> $conn = Doctrine_Manager::connection();
|
||||
<td class="covered"> $conn = Doctrine_Manager::connection();
|
||||
</td></tr>
|
||||
<tr><td>214</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>215</td>
|
||||
<td class="red"> $result = $conn->fetchColumn("SELECT version FROM " . $this->_migrationTableName);
|
||||
<td class="covered"> $result = $conn->fetchColumn("SELECT version FROM " . $this->_migrationTableName);
|
||||
</td></tr>
|
||||
<tr><td>216</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>217</td>
|
||||
<td class="red"> return isset($result[0]) ? true:false;
|
||||
<td class="covered"> return isset($result[0]) ? true:false;
|
||||
</td></tr>
|
||||
<tr><td>218</td>
|
||||
<td class="orange"> }
|
||||
@ -1030,16 +1030,16 @@
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>341</td>
|
||||
<td class="red"> } else {
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>342</td>
|
||||
<td class="red"> for ($i = $from; $i > $to; $i--) {
|
||||
<td class="covered"> for ($i = $from; $i > $to; $i--) {
|
||||
</td></tr>
|
||||
<tr><td>343</td>
|
||||
<td class="red"> $this->doMigrateStep($direction, $i);
|
||||
<td class="covered"> $this->doMigrateStep($direction, $i);
|
||||
</td></tr>
|
||||
<tr><td>344</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>345</td>
|
||||
<td class="normal"> }
|
||||
@ -1048,13 +1048,13 @@
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>347</td>
|
||||
<td class="red"> $this->setCurrentVersion($to);
|
||||
<td class="covered"> $this->setCurrentVersion($to);
|
||||
</td></tr>
|
||||
<tr><td>348</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>349</td>
|
||||
<td class="red"> return $to;
|
||||
<td class="covered"> return $to;
|
||||
</td></tr>
|
||||
<tr><td>350</td>
|
||||
<td class="orange"> }
|
||||
@ -1168,16 +1168,16 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>387</td>
|
||||
<td class="red"> $options = get_defined_vars();
|
||||
<td class="covered"> $options = get_defined_vars();
|
||||
</td></tr>
|
||||
<tr><td>388</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>389</td>
|
||||
<td class="red"> $this->addChange('dropped_tables', $options);
|
||||
<td class="covered"> $this->addChange('dropped_tables', $options);
|
||||
</td></tr>
|
||||
<tr><td>390</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>391</td>
|
||||
<td class="normal">
|
||||
@ -1519,16 +1519,16 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>504</td>
|
||||
<td class="covered"> $options = get_defined_vars();
|
||||
<td class="red"> $options = get_defined_vars();
|
||||
</td></tr>
|
||||
<tr><td>505</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>506</td>
|
||||
<td class="covered"> $this->addChange('changed_columns', $options);
|
||||
<td class="red"> $this->addChange('changed_columns', $options);
|
||||
</td></tr>
|
||||
<tr><td>507</td>
|
||||
<td class="covered"> }
|
||||
<td class="red"> }
|
||||
</td></tr>
|
||||
<tr><td>508</td>
|
||||
<td class="normal">
|
||||
|
@ -214,22 +214,22 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>69</td>
|
||||
<td class="red"> foreach ($tables as $table) {
|
||||
<td class="covered"> foreach ($tables as $table) {
|
||||
</td></tr>
|
||||
<tr><td>70</td>
|
||||
<td class="red"> $conn = $this->getConnection($table['tableName']);
|
||||
<td class="covered"> $conn = $this->getConnection($table['tableName']);
|
||||
</td></tr>
|
||||
<tr><td>71</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>72</td>
|
||||
<td class="red"> $conn->export->dropTable($table['tableName']);
|
||||
<td class="covered"> $conn->export->dropTable($table['tableName']);
|
||||
</td></tr>
|
||||
<tr><td>73</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>74</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>75</td>
|
||||
<td class="normal">
|
||||
@ -406,28 +406,28 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>133</td>
|
||||
<td class="covered"> foreach ($columns as $column) {
|
||||
<td class="red"> foreach ($columns as $column) {
|
||||
</td></tr>
|
||||
<tr><td>134</td>
|
||||
<td class="covered"> $conn = $this->getConnection($column['tableName']);
|
||||
<td class="red"> $conn = $this->getConnection($column['tableName']);
|
||||
</td></tr>
|
||||
<tr><td>135</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>136</td>
|
||||
<td class="covered"> $options = array();
|
||||
<td class="red"> $options = array();
|
||||
</td></tr>
|
||||
<tr><td>137</td>
|
||||
<td class="covered"> $options = $column['options'];
|
||||
<td class="red"> $options = $column['options'];
|
||||
</td></tr>
|
||||
<tr><td>138</td>
|
||||
<td class="covered"> $options['type'] = $column['type'];
|
||||
<td class="red"> $options['type'] = $column['type'];
|
||||
</td></tr>
|
||||
<tr><td>139</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>140</td>
|
||||
<td class="covered"> $conn->export->alterTable($column['tableName'], array('change' => array($column['columnName'] => array('definition' => $options))));
|
||||
<td class="red"> $conn->export->alterTable($column['tableName'], array('change' => array($column['columnName'] => array('definition' => $options))));
|
||||
</td></tr>
|
||||
<tr><td>141</td>
|
||||
<td class="red"> }
|
||||
|
@ -319,13 +319,13 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>104</td>
|
||||
<td class="red"> $parser = self::getParser($type);
|
||||
<td class="covered"> $parser = self::getParser($type);
|
||||
</td></tr>
|
||||
<tr><td>105</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>106</td>
|
||||
<td class="red"> return $parser->dumpData($array, $path);
|
||||
<td class="covered"> return $parser->dumpData($array, $path);
|
||||
</td></tr>
|
||||
<tr><td>107</td>
|
||||
<td class="orange"> }
|
||||
@ -415,10 +415,10 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>136</td>
|
||||
<td class="red"> if ($path) {
|
||||
<td class="covered"> if ($path) {
|
||||
</td></tr>
|
||||
<tr><td>137</td>
|
||||
<td class="red"> return file_put_contents($path, $data);
|
||||
<td class="covered"> return file_put_contents($path, $data);
|
||||
</td></tr>
|
||||
<tr><td>138</td>
|
||||
<td class="orange"> } else {
|
||||
|
@ -154,19 +154,19 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>49</td>
|
||||
<td class="red"> $spyc = new Doctrine_Spyc();
|
||||
<td class="covered"> $spyc = new Doctrine_Spyc();
|
||||
</td></tr>
|
||||
<tr><td>50</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>51</td>
|
||||
<td class="red"> $data = $spyc->dump($array, false, false);
|
||||
<td class="covered"> $data = $spyc->dump($array, false, false);
|
||||
</td></tr>
|
||||
<tr><td>52</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>53</td>
|
||||
<td class="red"> return $this->doDump($data, $path);
|
||||
<td class="covered"> return $this->doDump($data, $path);
|
||||
</td></tr>
|
||||
<tr><td>54</td>
|
||||
<td class="orange"> }
|
||||
|
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: Groupby.php 2702 2007-10-03 21:43:22Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Groupby.php 3041 2007-10-30 19:10:18Z zYne $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -97,7 +97,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2702 $
|
||||
<td class="normal"> * @version $Revision: 3041 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
@ -148,50 +148,60 @@
|
||||
<td class="covered"> $reference = trim($reference);
|
||||
</td></tr>
|
||||
<tr><td>47</td>
|
||||
<td class="covered"> $e = explode('.', $reference);
|
||||
</td></tr>
|
||||
<tr><td>48</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>48</td>
|
||||
<td class="normal"> /**
|
||||
</td></tr>
|
||||
<tr><td>49</td>
|
||||
<td class="covered"> if (count($e) > 1) {
|
||||
<td class="normal"> if (count($e) > 1) {
|
||||
</td></tr>
|
||||
<tr><td>50</td>
|
||||
<td class="covered"> $field = array_pop($e);
|
||||
<td class="normal"> $field = array_pop($e);
|
||||
</td></tr>
|
||||
<tr><td>51</td>
|
||||
<td class="covered"> $ref = implode('.', $e);
|
||||
<td class="normal"> $ref = implode('.', $e);
|
||||
</td></tr>
|
||||
<tr><td>52</td>
|
||||
<td class="covered"> $this->query->load($ref);
|
||||
<td class="normal"> $this->query->load($ref);
|
||||
</td></tr>
|
||||
<tr><td>53</td>
|
||||
<td class="normal">
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>54</td>
|
||||
<td class="covered"> $r[] = $this->query->getTableAlias($ref) . '.' . $field;
|
||||
<td class="normal"> $r[] = $this->query->getTableAlias($ref) . '.' . $field;
|
||||
</td></tr>
|
||||
<tr><td>55</td>
|
||||
<td class="covered"> } else {
|
||||
<td class="normal"> } else {
|
||||
</td></tr>
|
||||
<tr><td>56</td>
|
||||
<td class="red"> $alias = end($e);
|
||||
<td class="normal"> $alias = end($e);
|
||||
</td></tr>
|
||||
<tr><td>57</td>
|
||||
<td class="red"> $r[] = $this->query->getAggregateAlias($alias);
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>58</td>
|
||||
<td class="normal"> }
|
||||
<td class="normal"> $r[] = $this->query->getAggregateAlias($alias);
|
||||
</td></tr>
|
||||
<tr><td>59</td>
|
||||
<td class="covered"> }
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>60</td>
|
||||
<td class="covered"> return implode(', ', $r);
|
||||
<td class="normal"> */
|
||||
</td></tr>
|
||||
<tr><td>61</td>
|
||||
<td class="orange"> }
|
||||
<td class="covered"> $r[] = $this->query->parseClause($reference);
|
||||
</td></tr>
|
||||
<tr><td>62</td>
|
||||
<td class="covered">}</td></tr>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>63</td>
|
||||
<td class="covered"> return implode(', ', $r);
|
||||
</td></tr>
|
||||
<tr><td>64</td>
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>65</td>
|
||||
<td class="normal">}
|
||||
</td></tr>
|
||||
</table></body></html>
|
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Orderby.php 2702 2007-10-03 21:43:22Z Jonathan.Wage $
|
||||
<td class="normal"> * $Id: Orderby.php 3041 2007-10-30 19:10:18Z zYne $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -97,7 +97,7 @@
|
||||
<td class="normal"> * @since 1.0
|
||||
</td></tr>
|
||||
<tr><td>30</td>
|
||||
<td class="normal"> * @version $Revision: 2702 $
|
||||
<td class="normal"> * @version $Revision: 3041 $
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @author Konsta Vesterinen <kvesteri@cc.hut.fi>
|
||||
@ -148,86 +148,24 @@
|
||||
<td class="covered"> foreach (explode(',', trim($str)) as $r) {
|
||||
</td></tr>
|
||||
<tr><td>47</td>
|
||||
<td class="covered"> $r = trim($r);
|
||||
<td class="covered"> $r = $this->query->parseClause($r);
|
||||
</td></tr>
|
||||
<tr><td>48</td>
|
||||
<td class="covered"> $e = explode(' ', $r);
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>49</td>
|
||||
<td class="covered"> $a = explode('.', $e[0]);
|
||||
</td></tr>
|
||||
<tr><td>50</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>51</td>
|
||||
<td class="covered"> if (count($a) > 1) {
|
||||
</td></tr>
|
||||
<tr><td>52</td>
|
||||
<td class="covered"> $field = array_pop($a);
|
||||
</td></tr>
|
||||
<tr><td>53</td>
|
||||
<td class="covered"> $reference = implode('.', $a);
|
||||
</td></tr>
|
||||
<tr><td>54</td>
|
||||
<td class="covered"> $name = end($a);
|
||||
</td></tr>
|
||||
<tr><td>55</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>56</td>
|
||||
<td class="covered"> $map = $this->query->load($reference, false);
|
||||
</td></tr>
|
||||
<tr><td>57</td>
|
||||
<td class="covered"> $tableAlias = $this->query->getTableAlias($reference);
|
||||
</td></tr>
|
||||
<tr><td>58</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>59</td>
|
||||
<td class="covered"> $r = $tableAlias . '.' . $field;
|
||||
</td></tr>
|
||||
<tr><td>60</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>61</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>62</td>
|
||||
<td class="covered"> } else {
|
||||
</td></tr>
|
||||
<tr><td>63</td>
|
||||
<td class="covered"> $field = $this->query->getAggregateAlias($e[0]);
|
||||
</td></tr>
|
||||
<tr><td>64</td>
|
||||
<td class="normal">
|
||||
</td></tr>
|
||||
<tr><td>65</td>
|
||||
<td class="covered"> $r = $field;
|
||||
</td></tr>
|
||||
<tr><td>66</td>
|
||||
<td class="normal"> }
|
||||
</td></tr>
|
||||
<tr><td>67</td>
|
||||
<td class="covered"> if (isset($e[1])) {
|
||||
</td></tr>
|
||||
<tr><td>68</td>
|
||||
<td class="covered"> $r .= ' ' . $e[1];
|
||||
</td></tr>
|
||||
<tr><td>69</td>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>70</td>
|
||||
<td class="covered"> $ret[] = $r;
|
||||
</td></tr>
|
||||
<tr><td>71</td>
|
||||
<tr><td>50</td>
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>72</td>
|
||||
<tr><td>51</td>
|
||||
<td class="covered"> return $ret;
|
||||
</td></tr>
|
||||
<tr><td>73</td>
|
||||
<tr><td>52</td>
|
||||
<td class="orange"> }
|
||||
</td></tr>
|
||||
<tr><td>74</td>
|
||||
<td class="covered">}</td></tr>
|
||||
<tr><td>53</td>
|
||||
<td class="normal">}
|
||||
</td></tr>
|
||||
</table></body></html>
|
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Record.php 3031 2007-10-29 19:26:22Z bschussek $
|
||||
<td class="normal"> * $Id: Record.php 3037 2007-10-29 23:34:10Z zYne $
|
||||
</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: 3031 $
|
||||
<td class="normal"> * @version $Revision: 3037 $
|
||||
</td></tr>
|
||||
<tr><td>33</td>
|
||||
<td class="normal"> */
|
||||
@ -541,7 +541,7 @@
|
||||
<td class="covered"> if ( ! $exists) {
|
||||
</td></tr>
|
||||
<tr><td>178</td>
|
||||
<td class="covered"> if ($count > 0) {
|
||||
<td class="covered"> if ($count > count($this->_values)) {
|
||||
</td></tr>
|
||||
<tr><td>179</td>
|
||||
<td class="covered"> $this->_state = Doctrine_Record::STATE_TDIRTY;
|
||||
|
@ -295,10 +295,10 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>96</td>
|
||||
<td class="red"> $this->_table->setAttribute($attr, $value);
|
||||
<td class="covered"> $this->_table->setAttribute($attr, $value);
|
||||
</td></tr>
|
||||
<tr><td>97</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>98</td>
|
||||
<td class="normal"> public function setTableName($tableName)
|
||||
@ -307,7 +307,7 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>100</td>
|
||||
<td class="covered"> $this->_table->setOption('tableName', $tableName);
|
||||
<td class="covered"> $this->_table->setTableName($tableName);
|
||||
</td></tr>
|
||||
<tr><td>101</td>
|
||||
<td class="covered"> }
|
||||
|
@ -529,10 +529,10 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>174</td>
|
||||
<td class="red"> if (isset($this->definition[$offset])) {
|
||||
<td class="covered"> if (isset($this->definition[$offset])) {
|
||||
</td></tr>
|
||||
<tr><td>175</td>
|
||||
<td class="red"> return $this->definition[$offset];
|
||||
<td class="covered"> return $this->definition[$offset];
|
||||
</td></tr>
|
||||
<tr><td>176</td>
|
||||
<td class="orange"> }
|
||||
|
@ -16,7 +16,7 @@
|
||||
<td class="normal">/*
|
||||
</td></tr>
|
||||
<tr><td>3</td>
|
||||
<td class="normal"> * $Id: Table.php 2991 2007-10-22 17:33:47Z zYne $
|
||||
<td class="normal"> * $Id: Table.php 3038 2007-10-30 13:30:50Z romanb $
|
||||
</td></tr>
|
||||
<tr><td>4</td>
|
||||
<td class="normal"> *
|
||||
@ -100,7 +100,7 @@
|
||||
<td class="normal"> * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||
</td></tr>
|
||||
<tr><td>31</td>
|
||||
<td class="normal"> * @version $Revision: 2991 $
|
||||
<td class="normal"> * @version $Revision: 3038 $
|
||||
</td></tr>
|
||||
<tr><td>32</td>
|
||||
<td class="normal"> * @link www.phpdoctrine.com
|
||||
@ -4417,10 +4417,10 @@
|
||||
<td class="normal"> {
|
||||
</td></tr>
|
||||
<tr><td>1470</td>
|
||||
<td class="red"> $this->_options['tableName'] = $tableName;
|
||||
<td class="covered"> $this->setOption('tableName', $this->_conn->formatter->getTableName($tableName));
|
||||
</td></tr>
|
||||
<tr><td>1471</td>
|
||||
<td class="red"> }
|
||||
<td class="covered"> }
|
||||
</td></tr>
|
||||
<tr><td>1472</td>
|
||||
<td class="normal">
|
||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user