Changeset 6772

Timestamp:

02/16/07 17:29:30

Author:

jan

Message:

schema validator in ExportSchemaTask?: it now validates for sql keywords and activerecord conventions

Files:

• trunk/README (modified) (1 diff)
• trunk/Rakefile (modified) (1 diff)
• trunk/example/Rakefile (modified) (1 diff)
• trunk/example/src/jerbil/example/EntityWithValidationErrors.java (added)
• trunk/example/src/jerbil/example/JerbilEntity.java (modified) (3 diffs)
• trunk/lib/jerbil/hibernate_task.rb (modified) (7 diffs)
• trunk/lib/jerbil/inflections.rb (added)
• trunk/lib/jerbil/inflector.rb (added)
• trunk/sql_reserved_words (added)
• trunk/sql_reserved_words/mysql5 (added)
• trunk/sql_reserved_words/oracle10g (added)
• trunk/test/test_build.rb (modified) (1 diff)
• trunk/test/test_java_helper.rb (modified) (1 diff)

trunk/README

@@ -150 +150 @@
-or implied. See the License for the specific language governing permissions and limitations under 
-the License. 
+
+== 3dparty code / MIT License
+
+This product contains portions of Rails (activesupport/inflector.rb,
+activesupport/inflections.rb) which are licensed as follows:
+
+Copyright (c) 2004-2006 David Heinemeier Hansson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.Copyright (c) 2004-2006 David Heinemeier Hansson
+

trunk/Rakefile

@@ -7 +7 @@
-CLEAN.include('pkg')
-
-
+sql_reserved_words/*', '
-FULLFILES = FILES.clone.include('buildsupport/**/*', 'example/**/*' )
-TESTFILES = FileList['test/test_java_helper.rb']

trunk/example/Rakefile

@@ -103 +103 @@
-end
-
+desc "validate schema success"
+Jerbil::Hibernate::ExportSchemaTask.new(:validate_schema_success) do |t|
+  t.schemafile = DB_SCHEMA
+  t.entities_yml = ENTITIES_YML
+        t.validate :all
+  t.filter { |classname| classname =~ /^jerbil\.example\.JerbilEntity/ }
+  
+  # not used, just for testing
+  t.inflections { |inflect| inflect.irregular( 'data' , 'data') }
+end
+
+desc "validate schema failure"
+Jerbil::Hibernate::ExportSchemaTask.new(:validate_schema_failure) do |t|
+  t.schemafile = DB_SCHEMA
+  t.entities_yml = ENTITIES_YML
+        t.validate :all
+  t.filter { |classname| classname =~ /^jerbil\.example\.EntityWithValidationErrors/ } 
+end
+
-Jerbil::Hibernate::ExportSchemaTask.new(:export_schema_filtered) do |t|
-  t.schemafile = DB_SCHEMA

trunk/example/src/jerbil/example/JerbilEntity.java

@@ -3 +3 @@
-import org.hibernate.annotations.Index;
-
+
-import javax.persistence.Entity;
+import javax.persistence.Column;
-import javax.persistence.Id;
-import javax.persistence.Table;
@@ -15 +17 @@
-
-    private Long id;
-
+
+
+
-
-    @Id
@@ -34 +38 @@
-        this.name = name;
-    }
+
+                // not activerecord conformant, but reserved
+                @Column(name = "is_primary" )
+                public boolean isPrimary() {
+                        return primary;
+                }
+
+                public void setPrimary(boolean b) {
+                        primary = b;
+                }
+
+                @Column(name = "last_name")
+                public String getLastName() {
+                        return lastName;
+                }
+
+                public void setLastName(String n) {
+                        this.lastName = n;
+                }
-}

trunk/lib/jerbil/hibernate_task.rb

@@ -2 +2 @@
-require 'rake/tasklib'
-require 'jerbil/java_helper'
+require 'jerbil/inflector'
-require 'yaml'
-require 'set'
@@ -11 +12 @@
-    # gather a list of entities which then gets serialized to a YAML file.
-    # ExportSchemaTask then reads this file and uses Hibernate's schema exporting 
-
+
+
+
-    #
-    # == Example
-    #   Jerbil::Hibernate::ExportSchemaTask.new(:export_schema) do |t|
-    #       t.schemafile = "schema.sql"
-
+
+
-    #   end
-    class ExportSchemaTask < Rake::TaskLib
@@ -47 +51 @@
-      
-      # Pretty printing of generated SQL (default: true)
-
+            
-      
-      def initialize(name=:export_schema)
@@ -54 +58 @@
-        @classfilter = nil
-        @prettyprint = true
+        @validate = []
-        @schemafile = "schema.sql"
-        @entities_yml = "entities.yml"
-        @properties_yml = nil
-        @dialect = "org.hibernate.dialect.MySQL5Dialect"
+        @sql_reserved = nil
-                
-        yield self if block_given?
-        define
-
+           
-      
-      def define # :nodoc:
@@ -77 +83 @@
-
-          cfg = get_config(entity_classes, properties, package)
+          
+          validate_config(cfg) unless validate.empty?
-          sql = cfg.generateSchemaCreationScript(Rjb::import(dialect).new)
-          
@@ -104 +112 @@
-      def filter(*args, &block)
-          @classfilter = block
+      end
+      
+      # Validate configuration (options: :all, :sql, :rails)
+      def validate(*what)
+        @validate.concat(what)
+      end
+      
+      # Exposes the inflections instance so exceptions can be registered.
+      def inflections
+        yield Inflector::Inflections.instance if block_given?
-      end
-        
@@ -130 +148 @@
-      def format(sql)
-        Rjb::import('org.hibernate.pretty.DDLFormatter').new(sql).format      
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-end
-

trunk/test/test_build.rb

@@ -89 +89 @@
-  end
-  
+  def test_validate_schema_success
+    run_rake_clean(:validate_schema_success) do |ok,res|
+      assert ok    
+      assert File.exists?(DB_SCHEMA)
+      #make sure file is not empty
+      assert File.size(DB_SCHEMA) >= 200
+    end
+  end
+  
+  def test_validate_schema_failure
+    run_rake_clean(:validate_schema_failure) do |ok,res|
+      assert !ok     
+    end
+  end
+  
-  
-  def test_run_no_fork

trunk/test/test_java_helper.rb

@@ -44 +44 @@
-      
-      classnames = flist.to_classnames
-5
+6
-      assert_equal 1, flist.resources.length, flist.resources
-