Changeset 6174

Timestamp:

11/29/06 17:38:12

Author:

jan

Message:

simplified export schema task

Files:

• trunk/example/example.iml (modified) (2 diffs)
• trunk/example/example.ipr (modified) (13 diffs)
• trunk/example/src/jerbil/example/JerbilEntity.java (modified) (2 diffs)
• trunk/lib/jerbil/hibernate_task.rb (modified) (9 diffs)

trunk/example/example.iml

@@ -2 +2 @@
-<module version="4" relativePaths="true" type="JAVA_MODULE">
-  <component name="ModuleRootManager" />
-
+ inherit-compiler-output="false"
-    <output url="file://$MODULE_DIR$/classes" />
-    <exclude-output />
@@ -29 +29 @@
-      </library>
-    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/hibernate-annotations.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
-    <orderEntryProperties />
-  </component>

trunk/example/example.ipr

@@ -4 +4 @@
-    <defaultAnt bundledAnt="true" />
-  </component>
+  <component name="BuildJarProjectSettings">
+    <option name="BUILD_JARS_ON_MAKE" value="false" />
+  </component>
+  <component name="CodeStyleProjectProfileManger">
+    <option name="PROJECT_PROFILE" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+  </component>
-  <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS" />
@@ -10 +17 @@
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
-    <option name="DEPLOY_AFTER_MAKE" value="0" />
-    <resourceExtensions>
@@ -33 +39 @@
-  </component>
-  <component name="DependencyValidationManager" />
+  <component name="EclipseCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
+  <component name="EclipseEmbeddedCompilerSettings">
+    <option name="DEBUGGING_INFO" value="true" />
+    <option name="GENERATE_NO_WARNINGS" value="true" />
+    <option name="DEPRECATION" value="false" />
+    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+    <option name="MAXIMUM_HEAP_SIZE" value="128" />
+  </component>
-  <component name="EntryPointsManager">
-    <entry_points />
@@ -42 +62 @@
-  </component>
-  <component name="GUI Designer component loader factory" />
+  <component name="IdProvider" IDEtalkID="3DEFDCA7E26A1BC38A63539E860BD2E6" />
+  <component name="InspectionProjectProfileManager">
+    <option name="PROJECT_PROFILE" value="Project Default" />
+    <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
+    <scopes />
+    <profiles>
+      <profile version="1.0" is_locked="false">
+        <option name="myName" value="Project Default" />
+        <option name="myLocal" value="false" />
+        <used_levels>
+          <error>
+            <option name="myName" value="ERROR" />
+            <option name="myVal" value="400" />
+          </error>
+          <warning>
+            <option name="myName" value="WARNING" />
+            <option name="myVal" value="300" />
+          </warning>
+          <information>
+            <option name="myName" value="INFO" />
+            <option name="myVal" value="200" />
+          </information>
+          <server>
+            <option name="myName" value="SERVER PROBLEM" />
+            <option name="myVal" value="100" />
+          </server>
+        </used_levels>
+      </profile>
+    </profiles>
+  </component>
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
@@ -63 +113 @@
-    <option name="OTHER_OPTIONS" value="" />
-    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-  </component>
@@ -73 +124 @@
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
+  <component name="LogConsolePreferences">
+    <option name="FILTER_ERRORS" value="false" />
+    <option name="FILTER_WARNINGS" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="CUSTOM_FILTER" />
+  </component>
-  <component name="Palette2">
-    <group name="Swing">
-
+ auto-create-binding="false" can-attach-label="false"
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-
+ auto-create-binding="false" can-attach-label="false"
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-
+ auto-create-binding="false" can-attach-label="false"
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-
+ auto-create-binding="false" can-attach-label="true"
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-
+ auto-create-binding="true" can-attach-label="false"
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
@@ -93 +150 @@
-        </initial-values>
-      </item>
-
+ auto-create-binding="true" can-attach-label="false"
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
@@ -99 +156 @@
-        </initial-values>
-      </item>
-
+ auto-create-binding="true" can-attach-label="false"
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
@@ -105 +162 @@
-        </initial-values>
-      </item>
-
+ auto-create-binding="false" can-attach-label="false"
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
@@ -111 +168 @@
-        </initial-values>
-      </item>
-
+ auto-create-binding="true" can-attach-label="true"
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-
+ auto-create-binding="true" can-attach-label="true"
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-
+ auto-create-binding="true" can-attach-label="true"
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ auto-create-binding="true" can-attach-label="true"
+
+
+
+
+ auto-create-binding="true" can-attach-label="true"
+
+
+
+
+ auto-create-binding="true" can-attach-label="true"
+
+
+
+
+ auto-create-binding="true" can-attach-label="true"
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-
-
-
-
-
-
+ auto-create-binding="true" can-attach-label="false"
+
+
+
+
+ auto-create-binding="true" can-attach-label="false"
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-
-
-
-
-
-
+ auto-create-binding="true" can-attach-label="false"
+
+
+
+
+ auto-create-binding="true" can-attach-label="false"
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-
+ auto-create-binding="false" can-attach-label="false"
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-
+ auto-create-binding="true" can-attach-label="true"
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-
+ auto-create-binding="true" can-attach-label="false"
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
@@ -183 +257 @@
-  </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" />
+  <component name="ProjectRunConfigurationManager" />
-  <component name="RmicSettings">
-    <option name="IS_EANABLED" value="false" />
@@ -189 +264 @@
-    <option name="GENERATE_IIOP_STUBS" value="false" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
+  </component>
+  <component name="StarteamVcsAdapter" />
+  <component name="VssVcs" />
+  <component name="com.intellij.jsf.UserDefinedFacesConfigs">
+    <option name="USER_DEFINED_CONFIGS">
+      <value>
+        <list size="0" />
+      </value>
+    </option>
-  </component>
-  <component name="com.sixrr.metrics.MetricsReloaded">
@@ -205 +289 @@
-    <option name="INSTRUMENT_CLASSES" value="true" />
-    <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
+    <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" />
-  </component>
-  <UsedPathMacros />

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

@@ -1 +1 @@
-package jerbil.example;
+
+import org.hibernate.annotations.Index;
-
-import javax.persistence.Entity;
@@ -24 +26 @@
-    }
-
+    @Index( name = "name_idx" )
-    public String getName() {
-        return name;

trunk/lib/jerbil/hibernate_task.rb

@@ -7 +7 @@
-module Jerbil 
-  module Hibernate 
-using
+like
-    # SchemaExport tool. Typically Jerbil::AptTask is used to compile source files and
-    # gather a list of entities which then gets serialized to a YAML file.
-er to
-
+ing
+features to 
-    #
-    # == Example
@@ -26 +26 @@
-      attr_accessor :schemafile
-                        
-
+s
-      # serialized as a list of strings (YAML format).
-      attr_accessor :entities_yml
@@ -36 +36 @@
-      # SQL statements to be executed before generated sql.
-      attr_accessor :preamble
+      attr_accessor :epilogue
-                        
-      # FQN of a package containing package-info.java to be used by
@@ -41 +42 @@
-      attr_accessor :package
-      
+      # Pretty printing of generated SQL (default: true)
+      attr_accessor :prettyprint
+      
-      def initialize(name=:export_schema)
-        @name = name
-        @dependencies = []
-        @package = nil
-        @classfilter = nil
+        @prettyprint = true
-        @schemafile = "schema.sql"
-        @entities_yml = "entities.yml"
@@ -65 +69 @@
-          entity_classes = entities.map {|klass| Rjb::import(klass)}
-          
-schemaexporter = SchemaExporter.new( entity_classes, schemafile, dialect, package 
-chemaexporter.export
-
+cfg = get_config(entity_classes, package
+ql = cfg.generateSchemaCreationScript(Rjb::import(dialect).new)
+  
-          schema =  "# -- do not edit ---\n"
-          schema << "# generated by Jerbil::Hibernate::ExportSchemaTask at #{Time.new}\n\n"
@@ -73 +77 @@
-          schema << preamble if preamble
-          
-
-
+
+
+
+
-          
-
-
-
-
+
+
-          File.open(schemafile, "w") {|file| file << schema }
-        end
@@ -87 +91 @@
-      
-      # Filters all entities. Useful to only export schema for a subset of classes.
-
+==
-      # Jerbil::Hibernate::ExportSchemaTask.new(:export_schema) do |t|
-      #    t.filter { |classname| classname =~ /^foo/ }    
@@ -94 +98 @@
-          @classfilter = block
-      end
-    end
-  
-    # Turns the hibernate sql output into something readable. Only tested
-    # with the mysql dialect.
-    class SqlBeautifier
-      def SqlBeautifier.beautify(sql)
-        newsql = ""
-        sql.to_s.each do |line|
-          if line =~ /^create table (\w+) \((.+)\)$/ 
-            tablename = $1.strip
-            fields = $2.split(',')
-            newtabledef = "create table #{tablename} (\n"  
-            
-            fields.each_with_index do | definition, count |
-              newtabledef << "\  #{definition.strip}"
-              newtabledef << ",\n" if count < fields.length - 1
-            end
-            newtabledef << "\n);\n\n"
-            newsql << newtabledef
-          elsif line =~ /^alter table (\w+) ([^,]+),(.+)+$/
-            tablename = $1.strip
-            index = $2.strip
-            constraint = $3.strip
-            newsql << "alter table #{tablename}\n  #{index},\n  #{constraint};\n\n"   
-          else
-            newsql << line
-          end
-        end
-        newsql
-      end
-     end
-     
-     # Wrapper class around 
-     # {org.hibernate.tool.hbm2ddl.SchemaExport.}[http://www.hibernate.org/hib_docs/v3/api/org/hibernate/tool/hbm2ddl/SchemaExport.html]
-     class SchemaExporter
-       def initialize(classes, outputfile, dialect, package=nil)
-          @exporter = SchemaExporter.get_schema_exporter(classes, dialect, package)
-          @exporter.setOutputFile(outputfile)
-       end
-       
-       def export
-          @exporter.execute(false,false,false,true)
-       end
-       
-       private
-       def SchemaExporter.get_schema_exporter(classes, dialect, package=nil)
-        schemaexport = Rjb::import('org.hibernate.tool.hbm2ddl.SchemaExport')
-        cfg = get_config(classes, package)
-        cfg.getProperties.put('hibernate.dialect', dialect)
-           
-        schemaexporter = schemaexport.new_with_sig 'Lorg.hibernate.cfg.Configuration;', cfg
-        
-
-
-
-
-
-
+
+
-        anncfg = Rjb::import('org.hibernate.cfg.AnnotationConfiguration')
-        acfg = anncfg.new
@@ -164 +113 @@
-        packages << package if package
-        packages.each { |pkg| acfg.addPackage(pkg) }
+                
-        acfg
+      end
+      
+      def format(sql)
+        Rjb::import('org.hibernate.pretty.DDLFormatter').new(sql).format      
-      end
-    end