xmigra 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd656447d3e97ab9d03aa2e54e46bb9a127360d
-  data.tar.gz: 26d2311252254c1cd30ff722a0ace2bd3b30a932
+  metadata.gz: 1f8a897f40302df5b84071bf9088b787c7be65fa
+  data.tar.gz: 1445c109f2e4fb2f58aa2f2407660c5b472a45cc
 SHA512:
-  metadata.gz: 756effc61f5a46850c356b7f5d9732cd75781f511950a588766fc035bfa081bdc6ab52b9c85c7941ccb0972652aacfd0c555525b370cd9130de07e6c1bb08840
-  data.tar.gz: f309fab4c6ae9b3f7ce74d3eec5957e34d42b23cbdf5901f1f78f0449bd1466466ebfe2ac975c0d54cd48f315a9d8160cdcf3e4fa28b09e75666368680be29e5
+  metadata.gz: 8edd159507c099b6d6c16c99a5883cbad161025e6de3076fbe83465f4054e17da85c21b1c25e9b49bdc47e06cef46d9cd8cdb235b4a742ce42974df56fdbd0f5
+  data.tar.gz: 4b22d1239184bb5a44886db39ef5ccc8b8b569530bc495f8ab509e0a9df9272cd70e87e355210372a2d24b656271a5926005ae08d130392bbfbdbe40f45d26fa

data/lib/xmigra/declarative_support/table.rb

@@ -40,14 +40,20 @@ is a sequence of column names.  Only one primary key constraint may be
 specified, whether through use of "primary key" keys in column mappings or
 explicitly in the "constraints" section.  For foreign key constraint
 definitions, the value of the "columns" key must be a mapping of referring
-column name to referenced column name.  Check constraint definitions must have
-a "verify" key whose value is an SQL expression to be checked for all records.
-Default constraints (when given explicitly) must have a "value" key giving
-the expression (with possible limitations imposed by the database system in
-use) for the default value and an indication of the constrained column: either
-a "column" key giving explicit reference to a column or, if the constraint
-name starts with the implicit prefix, the part of the constraint name after
-the prefix.
+column name to referenced column name and a "link to" key, whose value gives
+the name of the relation referenced, must be given.  Check constraint
+definitions must have a "verify" key whose value is an SQL expression to be
+checked for all records.  Default constraints (when given explicitly) must
+have a "value" key giving the expression (with possible limitations imposed by
+the database system in use) for the default value and an indication of the
+constrained column: either a "column" key giving explicit reference to a
+column or, if the constraint name starts with the implicit prefix, the part of
+the constraint name after the prefix.
+
+In addition to the required keys, foreign key constraints support two optional
+keys: "on update" and "on delete".  These keys support generating "ON UPDATE"
+and "ON DELETE" rules in the foreign key constraint creation SQL.  The value
+associated with the key is used in the SQL.
 
 When specifying SQL expressions in YAML, make sure to use appropriate quoting.
 For example, where apostrophes delimit string literals in SQL and it might be
@@ -404,6 +410,16 @@ END_OF_HELP
         @columns_by_name.has_key? name
       end
       
+      def add_column(colspec)
+        raise "Columns may not be added to the primary key after construction" if colspec['primary key']
+        Column.new(colspec).tap do |col|
+          @columns_by_name[col.name] = col
+          if !(col_default = col.default_constraint).nil?
+            @constraints[col_default.name] = col_default
+          end
+        end
+      end
+      
       def add_default(colname, expression, constr_name=nil)
         col = get_column(colname)
         unless col.default_constraint.nil?
@@ -449,7 +465,7 @@ END_OF_HELP
         
         # Add new columns
         parts.concat add_table_columns_sql_statements(
-          delta.new_columns.lazy.map {|col| [col.name, col.type]}
+          delta.new_columns
         ).to_a
         
         # Alter existing columns
@@ -560,9 +576,9 @@ END_OF_HELP
         end
       end
       
-      def add_table_columns_sql_statements(column_name_type_pairs)
-        column_name_type_pairs.map do |col_name, col_type|
-          "ALTER TABLE #{name} ADD COLUMN #{col_name} #{col_type};"
+      def add_table_columns_sql_statements(columns)
+        columns.map do |col|
+          "ALTER TABLE #{name} ADD COLUMN #{column_creation_sql_fragment(col)};"
         end
       end
       

data/lib/xmigra/vcs_support/git.rb

@@ -293,7 +293,7 @@ module XMigra
       args = []
       
       commit = options.fetch(:revision, 'HEAD')
-      args << "#{commit}:#{path}"
+      args << "#{commit}:./#{path}"
       
       git(:show, *args)
     end
@@ -319,7 +319,7 @@ module XMigra
     end
     
     def vcs_uncommitted?
-      git_status == '??'
+      git_status == '??' || git_status[0] == 'A'
     end
     
     class VersionComparator

data/lib/xmigra/version.rb

@@ -1,3 +1,3 @@
 module XMigra
-  VERSION = "1.6.3"
+  VERSION = "1.6.5"
 end

data/test/git_vcs.rb

@@ -328,4 +328,55 @@ if GIT_PRESENT
       end
     end
   end
+  
+  run_test "XMigra recognizes files with changes in the index as uncommitted" do
+    test_object = Class.new do
+      include XMigra::GitSpecifics
+      def file_path
+        Pathname('foo.txt')
+      end
+    end.new
+    
+    1.temp_dirs do |repo|
+      initialize_git_repo(repo)
+      
+      Dir.chdir(repo) do
+        test_object.file_path.open('w') do |file|
+          file.puts 'bar'
+        end
+        
+        do_or_die %Q{git add #{test_object.file_path}}
+        
+        assert_eq(test_object.git_status, 'A ')
+        
+        assert {test_object.vcs_uncommitted?} # After add
+      end
+    end
+  end
+  
+  run_test "XMigra can retrieve content in a git subtree" do
+    test_object = Class.new do
+      include XMigra::GitSpecifics
+      def file_path
+        Pathname('foo.txt')
+      end
+    end.new
+    
+    1.temp_dirs do |repo|
+      initialize_git_repo(repo)
+      
+      (subdir = repo.join('subdir')).mkpath
+      
+      Dir.chdir(subdir) do
+        test_object.file_path.open('w') do |file|
+          file.puts 'bar'
+        end
+        
+        do_or_die %Q{git add #{test_object.file_path}}
+        do_or_die %Q{git commit -m "Committing"}
+        
+        assert_eq(test_object.vcs_contents(test_object.file_path), "bar\n")
+      end
+    end
+  end
 end

data/test/structure_declarative.rb

@@ -808,4 +808,33 @@ run_test "DeclarativeSupport::Table can alter an existing default constraint on
       "CONSTRAINT DF_WEAPON DEFAULT 'ROCK' FOR WEAPON"
     )
   end
+end
+
+run_test "DeclarativeSupport::Table can add a NOT NULL column" do
+  in_xmigra_schema do
+    do_or_die "git init", "Unable to initialize git repository"
+    decl_file = add_foo_declarative
+    do_or_die %Q{git add #{decl_file}}
+    do_or_die %Q{git commit -m "Committing foo"}
+    
+    deserializer = XMigra::ImpdeclMigrationAdder::SupportedObjectDeserializer.new(decl_file.basename('.yaml').to_s, XMigra::PgSQLSpecifics)
+    table_yaml = YAML.parse_file(decl_file)
+    table_old = deserializer.deserialize(table_yaml.children[0])
+    table_new = deserializer.deserialize(table_yaml.children[0])
+    table_new.add_column(
+      'name' => 'damage',
+      'type' => 'float',
+      'nullable' => false,
+    )
+    
+    delta = XMigra::DeclarativeSupport::Table::Delta.new(table_old, table_new)
+    assert_eq(delta.constraints_to_drop, [])
+    assert_eq(delta.new_columns.length, 1)
+    assert_eq(delta.removed_columns, [])
+    assert_eq(delta.new_constraint_sql_clauses, [])
+    assert_eq(delta.altered_column_pairs, [])
+    stmts = table_new.add_table_columns_sql_statements(delta.new_columns)
+    assert_eq(stmts.length, 1)
+    assert_include(stmts[0], /NOT\s+NULL/)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmigra
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Next IT Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler