kwatable 0.2.0 → 0.3.0

data/examples/ex3/Makefile

@@ -0,0 +1,52 @@
+###
+### $Rev: 44 $
+### $Release: 0.3.0 $
+### copyright(c) 2005 kuwata-lab.com all rights reserved.
+###
+
+DATAFILE = tabledef.yaml
+
+OPTS_DDL      = --droptable
+OPTS_DTO_JAVA = --package=my.example --parent=Object --populate --constructor --collection=set
+OPTS_DTO_RUBY = --module=Example --parent=Object --reqpath=lib --populate --symbolkey
+OPTS_RAILS_KWARTZ = --lang=ja --charset=UTF8 --stylesheet=site,local --session-token
+OPTS_RAILS_MODEL  = --lang=ja --encoding=UTF8
+OPTS_RAILS_CONTROLLER = --lang=ja --encoding=UTF8 --session-token
+OPTS_HIBERNATE = --collection=set --package=my.example
+
+RAILS_DIR       = rails
+VIEWS_DIR       = $(RAILS_DIR)/views
+MODELS_DIR      = $(RAILS_DIR)/models
+CONTROLLERS_DIR = $(RAILS_DIR)/controllers
+
+
+all:
+	kwatable -t ddl-mysql      $(DATAFILE) > ddl-mysql.sql
+	kwatable -t ddl-postgresql $(DATAFILE) > ddl-postgresql.sql
+	kwatable -t dto-java       $(DATAFILE)
+	kwatable -t dto-ruby       $(DATAFILE)
+	kwatable -t hibernate      $(DATAFILE) > hibernate.hbm.xml
+	mkdir -p $(VIEWS_DIR)
+	kwatable -t rails-kwartz -d $(VIEWS_DIR) $(DATAFILE) 
+	mkdir -p $(MODELS_DIR)
+	kwatable -t rails-model -d $(MODELS_DIR) $(DATAFILE)
+	mkdir -p $(CONTROLLERS_DIR)
+	kwatable -t rails-controller -d $(CONTROLLERS_DIR) $(DATAFILE)
+
+all2:
+	kwatable -t ddl-mysql      $(OPTS_DDL) $(DATAFILE) > ddl-mysql.sql
+	kwatable -t ddl-postgresql $(OPTS_DDL) $(DATAFILE) > ddl-postgresql.sql
+	kwatable -t dto-java  $(OPTS_DTO_JAVA) $(DATAFILE)
+	kwatable -t dto-ruby  $(OPTS_DTO_RUBY) $(DATAFILE)
+	kwatable -t hibernate $(OPTS_HIBERNATE) $(DATAFILE) > hibernate.hbm.xml
+	mkdir -p $(VIEWS_DIR)
+	kwatable -t rails-kwartz -d $(VIEWS_DIR) $(OPTS_RAILS_KWARTZ) $(DATAFILE)
+	mkdir -p $(MODELS_DIR)
+	kwatable -t rails-model -d $(MODELS_DIR) $(OPTS_RAILS_MODEL) $(DATAFILE)
+	mkdir -p $(CONTROLLERS_DIR)
+	kwatable -t rails-controller -d $(CONTROLLERS_DIR) $(OPTS_RAILS_CONTROLLER) $(DATAFILE)
+
+
+clean:
+	rm -rf *.sql *.java *.rb *.class *.xml $(RAILS_DIR)
+

data/examples/ex3/tabledef.yaml

@@ -0,0 +1,136 @@
+
+columns:
+
+  - name:	'no'
+    type:	int
+    ident:	yes
+    serial:	yes
+
+  - name:	code
+    type:	str
+    ident:	yes
+    width:	4
+
+  - name:	name
+    type:	str
+    unique:	yes
+    
+  - name:	desc
+    type:	str
+    
+  - name:	active
+    type:	boolean
+    default:	true
+
+
+tables:
+
+  - name:	dept
+    class:	Department
+    desc:	Department master table
+    columns:
+      - name:	code
+      - name:	name
+      - name:	desc
+      - name:	mngr_no
+        ref:	emp.no
+	attr:	manager_no
+      - name:	active
+    relations:
+      - kind:	'1:n'
+        referrer:  emp.dept_code
+	attr:   employees
+
+  - name:	emp
+    class:	Employee
+    desc:	Employee master table
+    columns:
+      - name:	'no'
+      - name:	name
+        unique:	no
+      - name:	desc
+      - name:	class
+        ref:	emp_class.code
+        attr:	class_code
+	required:  yes
+      - name:	dept_code
+	ref:	dept.code
+        attr:	department_code
+	required: yes
+      - name:	supervisor_no
+        ref:	emp.no
+      - name:	hired
+        type:	date
+      - name:	retired
+        type:	date
+    relations:
+      - kind:	'n:n'
+        referrer:  team.code
+	join-table: membership
+      - kind:   '1:n'
+        referrer:  emp.no
+	attr:	subordinates
+      - kind:	'1:1'
+        referrer:  personal_data.emp
+
+  - name:	emp_class
+    desc:	Employee class
+    class:	EmployeeClass
+    columns:
+      - name:	code
+      - name:	name
+      - name:	desc
+    relations:
+      - kind:	'1:n'
+        referrer:  emp.class
+	attr:   employees
+      
+  - name:	team
+    desc:	Team master table
+    columns:
+      - name:	code
+      - name:	name
+      - name:	desc
+      - name:	leader_no
+        ref:	emp.no
+      - name:	subleader_no
+        ref:	emp.no
+      - name:	start_date
+        type:	date
+      - name:	end_date
+        type:	date
+    relations:
+      - kind:	'n:n'
+        referrer:  emp.no
+	join-table: membership
+	attr:	members
+
+  - name:	membership
+    desc:	Join table of emp and team
+    columns:
+      - name:	emp_no
+        ref:	emp.no
+	attr:   employee_no
+	ref-name: employee
+      - name:	team_code
+        ref:	team.code
+    ident-columns: [ emp_no, team_code ]
+    modeling:   no
+
+  - name:	personal_data
+    desc:	Personal data of employees
+    columns:
+      - name:	emp
+        ref:	emp.no
+	ref-name:  employee
+	ident:	yes
+      - name:	gender
+        type:	char
+	enum:   [ M, F, X ]
+	required:  yes
+      - name:	birth
+        type:	date
+	required:  yes
+      - name:	married
+        type:   boolean
+        required: yes

data/kwatable.gemspec

@@ -4,8 +4,8 @@
 ### RubyGems Specification file for kwatable
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.2.0 $
-### $Rev: 10 $
+### $Release: 0.3.0 $
+### $Rev: 45 $
 ###
 
 require 'rubygems'
@@ -14,7 +14,7 @@ spec = Gem::Specification.new do |s|
   ## package information
   s.name        = 'kwatable'
   s.author      = 'makoto kuwata'
-  s.version     = ("$Release: 0.2.0 $" =~ /Release: ([\.\d]+)/) && $1
+  s.version     = ("$Release: 0.3.0 $" =~ /Release: ([\.\d]+)/) && $1
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'http://www.kuwata-lab.com/kwatable'
   s.summary     = "SQL and DTO generator from table definition"
@@ -26,20 +26,21 @@ spec = Gem::Specification.new do |s|
   DTO class file for Java and Ruby.
   You can add your own eRuby template.
   END
-  
+
   ## files
   files = []
-  files += Dir.glob('lib/**/*')
-  files += Dir.glob('bin/**/*')
-  files += Dir.glob('templates/**/*')
-  files += Dir.glob('examples/**/*')
-  files += Dir.glob('test/**/*')
-  files += %w[README.txt ChangeLog.txt COPYING setup.rb kwatable.gemspec]
+  files.concat Dir.glob('lib/**/*')
+  files.concat Dir.glob('bin/**/*')
+  #files += Dir.glob('templates/**/*')
+  files.concat Dir.glob('examples/**/*')
+  files.concat Dir.glob('test/**/*')
+  files.concat %w[README.txt ChangeLog MIT-LICENSE setup.rb kwatable.gemspec]
   #s.files       = files.delete_if { |path| path =~ /\.svn/ }
   s.files       = files
   s.executables = ['kwatable']
   s.bindir      = 'bin'
   s.test_file   = 'test/test.rb'
+  s.add_dependency('kwalify', ['>= 0.6.0'])
 end
 
 if $0 == __FILE__

data/lib/kwatable.rb

@@ -1,30 +1,36 @@
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.2.0 $
-### $Rev: 15 $
+### $Release: 0.3.0 $
+### $Rev: 33 $
 ###
 
 module Kwatable
 
-   ## base class of exception
-   class KwatableError < StandardError
-   end
+  ## release number
+  RELEASE = ("$Release: 0.3.0 $" =~ /[\.\d]+/) && $&
 
-   ## template path
-   @@template_path = []
-   if ENV['KWATABLE_PATH']
-      @@template_path += ENV['KWATABLE_PATH'].split(File::PATH_SEPARATOR)
-   end
-   $LOAD_PATH.each do |path|
-      template_path = "#{path}/kwatable/templates"
-      @@template_path << template_path if test(?d, template_path)
-   end
+  ## base class of exception
+  class KwatableError < StandardError
+  end
 
-   def self.template_path
-      return @@template_path
-   end
+  ## template path
+  @@template_path = []
+  if ENV['KWATABLE_PATH']
+    @@template_path.concat ENV['KWATABLE_PATH'].split(File::PATH_SEPARATOR)
+  end
+  $LOAD_PATH.each do |path|
+    dir = "#{path}/kwatable/template"
+    @@template_path << dir if test(?d, dir)
+  end
+  dirs = [ "#{ENV['HOME']}/lib/kwatable/template" ]
+  @@template_path.concat dirs.find_all { |dir| test(?d, dir) }
+
+  def self.template_path
+    return @@template_path
+  end
 
 end
 
-require 'kwatable/error-msg'
+
+require 'kwatable/messages'
 require 'kwatable/manipulator'

data/lib/kwatable/kwatable.schema.yaml

@@ -2,8 +2,8 @@
 ### schema definition of kwalify for kwatable
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.2.0 $
-### $Rev: 17 $
+### $Release: 0.3.0 $
+### $Rev: 39 $
 ###
 
 
@@ -11,15 +11,20 @@ type:  map
 mapping:
  "columns":
     type:  seq
+    name:  COLUMNS
     sequence:
       - type:  map
-        mapping: &columrule
+        name:  COLUMN
+        mapping: &column
          "name":
             type:  str
             required: yes
             pattern:  /^\w+$/
+            unique:  yes
          "desc":
             type:  text
+         "attr":
+            type:  str
          "label":
             type:  str
          "type":
@@ -44,21 +49,27 @@ mapping:
               - blob
          "width":
             type:  int
+         "class":
+            type:  str
          #"identifier":
          "ident":
             type:  bool
+            desc:  means primary-key constraint
          "primary-key":
             type:  bool
             desc:  alias of 'ident'
          "required":
             type:  bool
+            desc:  means not-null constraint
          "not-null":
             type:  bool
             desc:  alias of 'required'
          "unique":
             type:  bool
+            desc:  means unique constraint
          "serial":
             type:  bool
+            desc:  means auto_increment in MySQL or serial in PostgreSQL
          "enum":
             type:  seq
             sequence:
@@ -66,22 +77,50 @@ mapping:
          "ref":
             type:  str
             pattern:  /^\w+(\.\w+|\(\w+\))$/
+            desc:  means foregin key
          "ref-name":
             type:  str
+         "cascade":
+            type:  bool
          "pattern":
             type:  str
             pattern: /^\/.*\/$/
-
+         "range":
+            type:  map
+            mapping:
+             "max":  { type: number }
+             "min":  { type: number }
+         "length":
+            type:  map
+            mapping:
+             "max":  { type: int }
+             "min":  { type: int }
+         "default":
+            type:  any
+         "status":
+            type:  str
+            enum:
+              - active
+              - pending
+              - obsolete
+         "vendor": &vendor
+            type:  map
+            mapping:
+              =:
+               type:  any
 
  "tables":
     type:  seq
+    name:  TABLES
     sequence:
       - type:  map
+        name:  TABLE
         mapping:
          "name":
             type:  str
             required: yes
             pattern:  /^\w+$/
+            unique:  yes
          "desc":
             type:  text
          "label":
@@ -89,8 +128,59 @@ mapping:
          "class":
             type:  str
             pattern:  /^[A-Z]\w+$/
+            unique:  yes
          "columns":
             type:  seq
             sequence:
               - type:  map
-                mapping: *columrule
+                mapping: *column
+         "ident-columns": &ident_columns
+            type:  seq
+            sequence:
+              - type: str
+         "primary-keys": *ident_columns
+         "display-column":
+            type:  str
+         "modeling":
+            type:  bool
+         "relations":
+            type:  seq
+            name:  RELATIONS
+            sequence:
+              - type:  map
+                name:  RELATION
+                mapping:
+                 "kind":     { type: str,  required: yes,
+                               enum: [ '1:1', '1:n', 'n:n' ] }
+                 "referrer": { type: str,  required: yes,
+                               pattern:  /^(\w+\.\w+|\w+\(\w+(,\s*\w+)*\))$/ }
+                 #"table":    { type: str,  required: yes }
+                 #"column":   { type: str }
+                 "attr":     { type: str }
+                 "desc":     { type: text }
+                 "cascade":  { type: bool }
+                 "where":    { type: str }
+                 "order-by": { type: str }
+                 "group-by": { type: str }
+                 "join-table": { type: str }
+                 "as":       { type: str }
+                 "through":  { type: str }
+                 "source":   { type: str }
+         "vendor":  *vendor
+
+ "connections":
+    type:   seq
+    name:   CONNECTIONS
+    sequence:
+      - type:   map
+        name:   CONNECTION
+        mapping:
+         "dbms":      { type: str,  required: yes }
+         "database":  { type: str,  required: yes }
+         "user":      { type: str }
+         "password":  { type: str }
+         "host":      { type: str }
+         "port":      { type: str }
+         "vendor": *vendor
+
+ "vendor":  *vendor