Permalink
Browse files

Merge pull request #107 from iarna/bugfixes

Bugfixes
  • Loading branch information...
2 parents dbc235a + 7113792 commit 6b1aa8ba86f9061254191e67bc03b03356343534 @aredridel aredridel committed Apr 6, 2012
Showing with 2 additions and 3 deletions.
  1. +1 −1 Modyllic/Diff.php
  2. +1 −1 Modyllic/Generator/SQL.php
  3. +0 −1 scripts/sqldump
View
@@ -46,7 +46,7 @@ private function calculate_changeset() {
}
// If our metadata table doesn't yet exist, create it
- if ( ! $this->from->sqlmeta_exists and $this->sqlmeta_exists ) {
+ if ( ! $this->from->sqlmeta_exists and $this->changeset->sqlmeta_exists ) {
$this->changeset->sqlmeta_exists = TRUE;
}
@@ -187,7 +187,7 @@ function drop( Modyllic_Schema $schema ) {
if ( isset($this->what['sqlmeta']) and $schema->sqlmeta_exists ) {
$this->drop_sqlmeta();
}
- if ( in_array('database',$what) ) {
+ if ( isset($this->what['database']) ) {
$this->drop_database( $schema );
}
$this->source = null;
View
@@ -25,7 +25,6 @@ $args = Modyllic_Commandline::getArgs(array(
'long_name' => '--only',
'description' => 'comma separated list of kinds of schema objects to process: database, sqlmeta, tables, views, routines, events, triggers',
'action' => 'StoreString',
- 'default' => implode(",",Modyllic_Generator_SQL::schema_types())
) ),
'arguments' => array(
'spec' => array('multiple'=>true) )));

0 comments on commit 6b1aa8b

Please sign in to comment.