dbagile 0.0.1 → 0.0.2

data/lib/dbagile/core/schema/errors.rb

@@ -102,13 +102,11 @@ module DbAgile
       TargetKeyMismatch
     ]
     MESSAGE_VALUES = [
-      'invalid default value on attribute #{schema_object.name}',
+      'invalid default value \'#{schema_object.default_value}\' on #{schema_object}',
       'relvar #{schema_object.relation_variable.name} has an empty heading (unsupported so far)',
       'relvar #{schema_object.name} has no primary key',
       'invalid constraint #{schema_object.name} on #{schema_object.relation_variable.name}',
-      
       'invalid index #{schema_object.name}',
-      
       'no such relvar #{args[:relvar_name]}',
       'no such attributes #{args[:attributes].join(\',\')}',
       'no such candidate key #{args[:constraint_name]}',

data/lib/dbagile/core/schema/logical.rb

@@ -18,6 +18,7 @@ module DbAgile
   end # module Core
 end # module DbAgile
 require 'dbagile/core/schema/logical/relvar'
+require 'dbagile/core/schema/logical/relview'
 require 'dbagile/core/schema/logical/heading'
 require 'dbagile/core/schema/logical/attribute'
 require 'dbagile/core/schema/logical/constraints'

data/lib/dbagile/core/schema/logical/attribute.rb

@@ -22,6 +22,10 @@ module DbAgile
           def mandatory?
             !(definition[:mandatory] == false)
           end
+          
+          def relvar
+            parent.parent
+          end
         
           ############################################################################
           ### Dependency control
@@ -38,7 +42,7 @@ module DbAgile
           
           # @see DbAgile::Core::Schema::SchemaObject
           def _semantics_check(clazz, buffer)
-            unless default_value.nil? or default_value.kind_of?(domain)
+            unless default_value.nil? or (domain === default_value)
               buffer.add_error(self, clazz::InvalidDefaultValue)
             end
           end
@@ -54,13 +58,18 @@ module DbAgile
               out.map("tag:yaml.org,2002:map", :inline ) do |map|
                 map.add('domain', defn[:domain].to_s)
                 map.add('mandatory', false) unless defn[:mandatory]
-                if defn[:default]
+                unless defn[:default].nil?
                   map.add('default', defn[:default])
                 end
               end
             }
           end
           
+          # Returns a string representation
+          def to_s
+            "Attribute  #{relvar.name}::#{name} #{definition.inspect}"
+          end
+          
         end # class Attribute
       end # module Logical
     end # module Schema

data/lib/dbagile/core/schema/logical/relview.rb

@@ -0,0 +1,42 @@
+module DbAgile
+  module Core
+    module Schema
+      class Logical
+        class Relview < Schema::Part
+        
+          ############################################################################
+          ### Dependency control
+          ############################################################################
+          
+          # @see DbAgile::Core::Schema::SchemaObject
+          def dependencies(include_parent = false)
+            include_parent ? [ parent ] : []
+          end
+          
+          ############################################################################
+          ### Check interface
+          ############################################################################
+          
+          # @see DbAgile::Core::Schema::SchemaObject
+          def _semantics_check(clazz, buffer)
+          end
+      
+          ############################################################################
+          ### About IO
+          ############################################################################
+        
+          # Delegation pattern on YAML flushing
+          def to_yaml(opts = {})
+            definition.to_yaml(opts)
+          end
+          
+          # Returns a string representation
+          def to_s
+            "Relview #{name} #{definition.inspect}"
+          end
+          
+        end # class Relview
+      end # module Logical
+    end # module Schema
+  end # module Core
+end # module DbAgile

data/lib/dbagile/core/schema/migrate/abstract_script.rb

@@ -33,3 +33,5 @@ require 'dbagile/core/schema/migrate/create_table'
 require 'dbagile/core/schema/migrate/drop_table'
 require 'dbagile/core/schema/migrate/expand_table'
 require 'dbagile/core/schema/migrate/collapse_table'
+require 'dbagile/core/schema/migrate/create_view'
+require 'dbagile/core/schema/migrate/drop_view'

data/lib/dbagile/core/schema/migrate/create_view.rb

@@ -0,0 +1,15 @@
+module DbAgile
+  module Core
+    module Schema
+      module Migrate
+        class CreateView < Migrate::Operation
+
+          def to_sql92
+            "CREATE VIEW #{table_name} (#{relvar.definition})"
+          end
+          
+        end # class CreateView
+      end # module Migrate
+    end # module Schema
+  end # module Core
+end # module DbAgile

data/lib/dbagile/core/schema/migrate/drop_view.rb

@@ -0,0 +1,15 @@
+module DbAgile
+  module Core
+    module Schema
+      module Migrate
+        class DropView < Migrate::Operation
+
+          def to_sql92
+            "DROP VIEW #{table_name}"
+          end
+          
+        end # class DropView
+      end # module Migrate
+    end # module Schema
+  end # module Core
+end # module DbAgile

data/lib/dbagile/core/schema/migrate/operation.rb

@@ -7,19 +7,21 @@ module DbAgile
           # The sub operations
           attr_reader :operations
         
-          # Targetted relation variable
-          attr_reader :relvar
+          # Targetted relation variable/view
+          attr_reader :rel_object
+          alias :relvar :rel_object
+          alias :relview :rel_object
           
           # Returns table name
           def table_name
             relvar.name
           end
           
-          def initialize(relvar)
-            unless relvar.kind_of?(DbAgile::Core::Schema::Logical::Relvar)
-              raise ArgumentError, "Relvar expected for relvar, got #{relvar.class}"
+          def initialize(rel_object)
+            unless rel_object.relvar? or rel_object.relview?
+              raise ArgumentError, "Relvar expected for rel_object, got #{rel_object.class}"
             end
-            @relvar = relvar
+            @rel_object = rel_object
             @operations = []
           end
           

data/lib/dbagile/core/schema/migrate/stager.rb

@@ -139,6 +139,11 @@ module DbAgile
             script << Migrate::DropTable.new(relvar)
           end
 
+          # Collapses a relation view
+          def collapse_relview(relview)
+            script << Migrate::DropView.new(relview)
+          end
+
           # Collapses a candidate key
           def collapse_candidate_key(ckey)
             with_collapse_helper(ckey.relation_variable){|h| h.candidate_key(ckey)}
@@ -172,16 +177,16 @@ module DbAgile
               # create the operation
               exists = relvar_exists?(rv)
               h = exists ? Migrate::ExpandTable.new(rv) : Migrate::CreateTable.new(rv)
-              
+            
               # execute sub operations and save
               yield(helpers[rv] = h)
               script << h
-              
+            
               # assert that the table now exists
               unless exists
                 relvar_exists!(rv)
               end
-              
+            
               # remove helper now
               helpers.delete(rv)
             end
@@ -248,6 +253,10 @@ module DbAgile
           end
           alias :expand_relvar :expand_relvar_xxx
           alias :expand_heading :expand_relvar_xxx
+          
+          def expand_relview(rv)
+            script << Migrate::CreateView.new(rv)
+          end
 
           ### Parts
 

data/lib/dbagile/core/schema/part.rb

@@ -25,55 +25,6 @@ module DbAgile
         def _semantics_check(clazz, buffer)
         end
         
-        ############################################################################
-        ### Schema typing
-        ############################################################################
-        
-        # Returns true if this object is a logical object, false otherwise
-        def logical?
-          relvar? or attribute? or constraint?
-        end
-        
-          # Returns true if this object is a relation variable, false otherwise
-          def relvar?
-            self.kind_of?(Schema::Logical::Relvar)
-          end
-        
-          # Returns true if this object is an attribute, false otherwise
-          def attribute?
-            self.kind_of?(Schema::Logical::Attribute)
-          end
-        
-          # Returns true if this object is a constraint, false otherwise
-          def constraint?
-            self.kind_of?(Schema::Logical::Constraint)
-          end
-      
-            # Returns true if this object is a candidate key, false otherwise
-            def candidate_key?
-              self.kind_of?(Schema::Logical::Constraint::CandidateKey)
-            end
-      
-            # Returns true if this object is a primary key, false otherwise
-            def primary_key?
-              self.candidate_key? and self.primary?
-            end
-      
-            # Returns true if this object is a foreign key, false otherwise
-            def foreign_key?
-              self.kind_of?(Schema::Logical::Constraint::ForeignKey)
-            end
-      
-        # Returns true if this object is a physical object, false otherwise
-        def physical?
-          index?
-        end
-        
-          # Returns true if this object is an index, false otherwise
-          def index?
-            self.kind_of?(Schema::Physical::Index)
-          end
-        
         ############################################################################
         ### Schema::SchemaObject
         ############################################################################

data/lib/dbagile/core/schema/schema_object.rb

@@ -25,6 +25,60 @@ module DbAgile
         end
         alias :terminal? :part?
         
+        ############################################################################
+        ### Schema typing
+        ############################################################################
+        
+        # Returns true if this object is a logical object, false otherwise
+        def logical?
+          relvar? or relview? or attribute? or constraint?
+        end
+        
+          # Returns true if this object is a relation view, false otherwise
+          def relview?
+            self.kind_of?(Schema::Logical::Relview)
+          end
+        
+          # Returns true if this object is a relation variable, false otherwise
+          def relvar?
+            self.kind_of?(Schema::Logical::Relvar)
+          end
+        
+          # Returns true if this object is an attribute, false otherwise
+          def attribute?
+            self.kind_of?(Schema::Logical::Attribute)
+          end
+        
+          # Returns true if this object is a constraint, false otherwise
+          def constraint?
+            self.kind_of?(Schema::Logical::Constraint)
+          end
+      
+            # Returns true if this object is a candidate key, false otherwise
+            def candidate_key?
+              self.kind_of?(Schema::Logical::CandidateKey)
+            end
+      
+            # Returns true if this object is a primary key, false otherwise
+            def primary_key?
+              self.candidate_key? and self.primary?
+            end
+      
+            # Returns true if this object is a foreign key, false otherwise
+            def foreign_key?
+              self.kind_of?(Schema::Logical::ForeignKey)
+            end
+      
+        # Returns true if this object is a physical object, false otherwise
+        def physical?
+          index?
+        end
+        
+          # Returns true if this object is an index, false otherwise
+          def index?
+            self.kind_of?(Schema::Physical::Index)
+          end
+        
         ############################################################################
         ### Schema hierarchy
         ############################################################################

data/lib/dbagile/environment/repository.rb

@@ -118,7 +118,7 @@ module DbAgile
       def with_current_database
         raise ArgumentError, "Missing block" unless block_given?
         db = repository.current_database
-        raise NoDefaultDatabaseError if db.nil?
+        raise DbAgile::NoDefaultDatabaseError, "No default database set (try 'dba use ...' first)" if db.nil?
         yield(db)
       end
       
@@ -140,7 +140,7 @@ module DbAgile
             raise ArgumentError, "Invalid database name #{db}"
         end
         raise NoSuchDatabaseError if db.nil?
-        db.with_connection(&block)
+        db.with_connection(conn_options, &block)
       end
       
       # 

data/lib/dbagile/errors.rb

@@ -27,4 +27,7 @@ module DbAgile
   # Raised when usage of schema files fails because they are not installed
   class NoSchemaFilesError < DbAgile::Error; end
   
+  # Raised when a candidate key cannot be infered from a given tuple
+  class CandidateKeyNotFoundError < DbAgile::Error; end
+  
 end # module DbAgile

data/lib/dbagile/io.rb

@@ -4,6 +4,7 @@ require 'dbagile/io/csv'
 require 'dbagile/io/json'
 require 'dbagile/io/yaml'
 require 'dbagile/io/xml'
+require 'dbagile/io/html'
 require 'dbagile/io/ruby'
 require 'dbagile/io/text'
 module DbAgile
@@ -15,10 +16,10 @@ module DbAgile
     }
       
     # Known IO formats
-    KNOWN_FORMATS = [:yaml, :csv, :json, :ruby, :text, :xml]
+    KNOWN_FORMATS = [:yaml, :csv, :json, :ruby, :text, :xml, :html]
     
     # Known to_xxx IO formats
-    KNOWN_TO_FORMATS = [:yaml, :csv, :json, :ruby, :text, :xml]
+    KNOWN_TO_FORMATS = [:yaml, :csv, :json, :ruby, :text, :xml, :html]
     
     # Known from_xxx formats
     KNOWN_FROM_FORMATS = [:yaml, :csv, :json, :ruby]
@@ -30,7 +31,8 @@ module DbAgile
       :json => DbAgile::IO::JSON,
       :ruby => DbAgile::IO::Ruby,
       :text => DbAgile::IO::Text,
-      :xml  => DbAgile::IO::XML
+      :xml  => DbAgile::IO::XML,
+      :html => DbAgile::IO::HTML
     }
     
     # Which format for what extension
@@ -41,6 +43,7 @@ module DbAgile
       ".yaml"  => :yaml,
       ".yml"   => :yaml,
       ".xml"   => :xml,
+      ".html"  => :html,
       ".ruby"  => :ruby,
       ".rb"    => :ruby
     }
@@ -52,6 +55,7 @@ module DbAgile
       :json => "application/json",
       :yaml => "text/yaml",
       :xml  => "text/xml",
+      :html => "text/html",
       :ruby => "text/plain"
     }
       

data/lib/dbagile/io/html.rb

@@ -0,0 +1,48 @@
+require "cgi"
+module DbAgile
+  module IO
+    module HTML
+      
+      DEFAULT_OPTIONS = { }
+      
+      def with_tag(tag, buffer, indent = 0)
+        buffer << "  "*indent << "<#{tag}>\n"
+        yield
+        buffer << "  "*indent << "</#{tag}>\n"
+      end
+      module_function :with_tag
+      
+      # 
+      # Outputs some data as an HTML string
+      #
+      # @return [...] the buffer itself
+      #
+      def to_html(data, columns = nil, buffer = "", options = {})
+        options = DEFAULT_OPTIONS.merge(options)
+        with_tag("table", buffer, 0) {
+          with_tag("thead", buffer, 1) {
+            with_tag("tr", buffer, 2) {
+              columns.each{|column|
+                buffer << "  "*3 << "<td>#{CGI::escape(column.to_s)}</td>\n"
+              }
+            }
+          }
+          with_tag("tbody", buffer, 1) {
+            data.each{|row|
+              with_tag("tr", buffer, 2) {
+                columns.each{|column|
+                  value = row[column]
+                  cssclazz = value.class.name.to_s.downcase
+                  buffer << "  "*3 << "<td class=\"#{cssclazz}\">#{CGI::escapeHTML(value.to_s)}</td>\n"
+                }
+              }
+            }
+          }
+        }
+        buffer
+      end
+      module_function :to_html
+      
+    end # module HTML
+  end # module IO
+end # module DbAgile