kwatable 0.2.0 → 0.3.0

data/ChangeLog

@@ -0,0 +1,46 @@
+---
+release:      0.2.0
+date:         2006-09-27
+
+enhancements:
+  - template/hibernate.eruby: add new template
+  - template/dto-java.eruby: support '--collection' property
+  - rails-controller.eruby: added
+  - template/*.eruby: add <template-help>
+  - add 'examples/ex3'
+  - add 'rails-model.eruby'
+  - add new option '-c' (check only)
+  - add new option '-u' (uncheck)
+  - add new option '-T' (not untabify)
+  - add validator.rb and validate datafiles in main.rb
+  - support multiple datafile
+  - property '--droptable' supported in ddl-{mysql,postgresql}.eruby
+  - command-line option '-hf template' shows template info
+  - command-line option '-hf template' shows available templates
+  - add new template 'rails-kwartz.eruby'
+  - template suffix '.eruby' is omittable
+
+changes:
+  -  main.rb: command-line option '-m' is removed
+  -  dto-{java,ruby}.eruby: splitted into sub template
+  -  main.rb: command-line option '-m' is now obsolete
+  -  ddl-mysql: change to print 'references' clause.
+  -  ddl-mysql, ddl-postgresql: to add 'default' constraint
+  -  populate() is improved in dto-java and dto-ruby
+  -  use setter method to set values in dto-java and dto-ruby
+  -  rename 'FooBarBaz.rb' to 'foo_bar_baz.rb' in dto-ruby.rb
+  -  rename 'kwartz/templates/' to 'kwartz/template'
+
+bugfixes:
+  -  template/dto-*.eruby: support command-line option '-d'
+  -  main.rb: show available template names
+  -  ex?/tabledef.yaml: column name 'modified_{on|at}' is changed to 'updated_{on|at}'
+  -  add 'import java.util.List;' in dto-java
+  -  add default constructor in dto-java
+  -  manipulator class now detect type of column which refers forward column
+  -  don't print column 'id' and '{created|modified}_{at|on}'
+  -  now displays column of foreign key
+  -  wrong argument passed to Kwatable.msg() in Manipulaotr#_error()
+  -  fixed on dto-java.eruby
+  -  fixed on dto-ruby.eruby
+

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+copyright(c) 2005 kuwata-lab.com all rights reserved.
+
+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.

data/README.txt

@@ -1,5 +1,5 @@
 .=title:	README
-.?release:	$Release: 0.2.0 $
+.?release:	$Release: 0.3.0 $
 
 
 .$ About
@@ -8,6 +8,8 @@ Kwatable is a command to generate SQL script which create tables from
 table definition file (*.yaml).
 See `examples' for details.
 
+NOTICE: Kwatable is now alpha version.  Spec may change in the future.
+
 
 
 .$ Installation
@@ -78,4 +80,4 @@ copyright(c) 2005 kuwata-lab.com all rights reserved.
 
 .$ License
 
-GNU General Public License ver2
+MIT-LICENSE

data/bin/kwatable

@@ -4,11 +4,11 @@
 ### kwatable - create table, dto class, or other from table definition
 ###
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.2.0 $
-### $Rev: 17 $
+### $Release: 0.3.0 $
+### $Rev: 25 $
 ###
 
 require 'kwatable'
-require 'kwatable/main-program'
+require 'kwatable/main'
 
-Kwatable::MainProgram.main(ARGV)
+Kwatable::Main.main(ARGV)

data/examples/ex1/Makefile

@@ -1,26 +1,52 @@
 ###
+### $Rev: 45 $
+### $Release: 0.3.0 $
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.2.0 $
-### $Rev: 17 $
 ###
 
-DATAFILE = example1.yaml
-OPTS_DTO_JAVA = --package=my.example --parent=Object --populate --constructor
-OPTS_DTO_RUBY = --module=Example --parent=Object --reqpath=lib --symbolkey
+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    -f ddl-mysql.eruby      $(DATAFILE) > ddl-mysql.sql
-	kwatable    -f ddl-postgresql.eruby $(DATAFILE) > ddl-postgresql.sql
-	kwatable -m -f dto-java.eruby       $(DATAFILE)
-	kwatable -m -f dto-ruby.eruby       $(DATAFILE)
+	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 -f ddl-mysql.eruby      $(DATAFILE) > ddl-mysql.sql
-	kwatable -f ddl-postgresql.eruby $(DATAFILE) > ddl-postgresql.sql
-	kwatable $(OPTS_DTO_JAVA) -m -f dto-java.eruby $(DATAFILE)
-	kwatable $(OPTS_DTO_RUBY) -m -f dto-ruby.eruby $(DATAFILE)
+	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 -f *.sql *.java *.rb *.class
+	rm -rf *.sql *.java *.rb *.class *.xml $(RAILS_DIR)
 

data/examples/ex1/{example1.yaml → tabledef.yaml}

@@ -2,8 +2,8 @@
 ## example data file for kwatable
 ##
 ## copyright(c) 2005 kuwata-lab.com all rights reserved.
-## $Release: 0.2.0 $
-## $Rev: 17 $
+## $Release: 0.3.0 $
+## $Rev: 39 $
 ##
 
 columns:
@@ -15,14 +15,14 @@ columns:
   - name:	name
     type:	string
     required:	yes
-    width:	63
+    width:	60
 
   - name:	desc
     type:	string
 
   - name:	email
     type:	string
-    width:	63
+    width:	60
 
   - name:	status
     type:	string
@@ -30,11 +30,11 @@ columns:
 
   - name:	username
     type:	string
-    width:	31
+    width:	30
 
   - name:	password
     type:	string
-    width:	31
+    width:	30
 
   - name:	memo
     type:	text
@@ -48,15 +48,41 @@ columns:
   - name:	age
     type:	integer
 
-  - name:	last_update
-    type:	timestamp
-
   - name:	gender
     type:	char
     enum:
       - M
       - F
 
+  - name:	last_update
+    type:	timestamp
+    required:	yes
+
+  - name:	created_on
+    desc:	created date
+    type:	date
+    default:	current_date
+    required:	yes
+
+  - name:	created_at
+    desc:	created timestamp
+    type:	timestamp
+    default:	current_timestamp
+    required:	yes
+
+  - name:	updated_on
+    desc:	last modified date
+    type:	date
+    default:	current_date
+    required:	yes
+
+  - name:	updated_at
+    desc:	last modified timestamp
+    type:	timestamp
+    default:	current_timestamp
+    required:	yes
+
+
 tables:
   - name:		groups
     class:		Group
@@ -71,9 +97,12 @@ tables:
       - name:		case
         type:		string
         enum:		[ normal, debug, emergency ]
-      - name:		flag_active
+      - name:		active
         desc:		is active?
         type:		boolean
+        default:	true
+      - name:		created_on
+      - name:		updated_on
 
   - name:		users
     class:		User
@@ -92,8 +121,10 @@ tables:
         desc:		group id to which user belongs
       - name:		account
         type:		string
-        width:		31
+        width:		30
         required:	yes
       - name:		password
         required:	yes
+      - name:		created_at
+      - name:		updated_at
 

data/examples/ex2/Makefile

@@ -1,25 +1,52 @@
 ###
+### $Rev: 45 $
+### $Release: 0.3.0 $
 ### copyright(c) 2005 kuwata-lab.com all rights reserved.
-### $Release: 0.2.0 $
-### $Rev: 17 $
 ###
 
-datafile = example2.yaml
-props_dto_java = --package=my.example --parent=Object --populate --constructor
-props_dto_ruby = --module=Example --parent=Object --reqpath=lib --symbolkey
+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    -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
-	kwatable    -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
-	kwatable -m -f dto-java.eruby $(datafile)
-	kwatable -m -f dto-ruby.eruby $(datafile)
+	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 -f ddl-mysql.eruby      $(datafile) > ddl-mysql.sql
-	kwatable -f ddl-postgresql.eruby $(datafile) > ddl-postgresql.sql
-	kwatable $(props_dto_java) -m -f dto-java.eruby $(datafile)
-	kwatable $(props_dto_ruby) -m -f dto-ruby.eruby $(datafile)
+	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 -f *.sql *.java *.rb *.class
+	rm -rf *.sql *.java *.rb *.class *.xml $(RAILS_DIR)
 

data/examples/ex2/{example2.yaml → tabledef.yaml}

@@ -1,12 +1,12 @@
 columns:
   - name:	id
     type:	int
-    primary-key: yes
+    ident:	yes
     serial:	yes
     
   - name:	name
     type:	str
-    not-null:	yes
+    required:	yes
     
   - name:	desc
     type:	str
@@ -14,22 +14,6 @@ columns:
 
 tables:
 
-  - name:	addresses
-    class:	Address
-    desc:	Address master table
-    columns:
-      - name:	id
-      - name:	zipcode
-        type:   str
-        width:  8
-        pattern:  /^\d+-\d+$/
-      - name:	addr1
-        type:   str
-      - name:	addr2
-        type:   str
-      - name:	addr3
-        type:   str
-
   - name:	customers
     class:	Customer
     desc:	Customer master table
@@ -40,9 +24,35 @@ tables:
         type:   str
       - name:	email
         type:   str
-      - name:	address_id
-        ref:	addresses.id
-        not-null: yes
+      - name:	zip
+	type:	str
+	width:	8
+	pattern:  /^\d\d\d-\d\d\d\d$/
+      - name:	address
+	type:	str
+#      - name:	address_id
+#        ref:	addresses.id
+#        required: yes
+#        cascade:  yes
+    relations:
+      - kind:	'1:n'
+        referrer:  sales_orders.customer_id
+
+#  - name:	addresses
+#    class:	Address
+#    desc:	Address master table
+#    columns:
+#      - name:	id
+#      - name:	zipcode
+#        type:   str
+#        width:  8
+#        pattern:  /^\d+-\d+$/
+#      - name:	addr1
+#        type:   str
+#      - name:	addr2
+#        type:   str
+#      - name:	addr3
+#        type:   str
 
   - name:	items
     class:	Item
@@ -53,7 +63,7 @@ tables:
       - name:	desc
       - name:	price
         type:	money
-	not-null: yes
+	required: yes
     
   - name:	sales_orders
     class:	SalesOrder
@@ -62,33 +72,38 @@ tables:
       - name:	id
       - name:	customer_id
         ref:	customers.id
-	not-null: yes
+	required: yes
       - name:	ordered_date
         type:   date
-        not-null:  yes
+        required:  yes
       - name:	delivery_date
         type:   date
       - name:   amount
         type:	money
+    relations:
+      - kind:   '1:n'
+        referrer: sales_order_lines(order_id)
+        order-by: num
+        cascade:  yes
 
   - name:	sales_order_lines
     class:	SalesOrderLine
     desc:	Sales Order detail lines
     columns:
+      - name:	   id
       - name:	   num
         type:	   int
-        not-null:  yes
+        required:  yes
       - name:      order_id
         ref:       sales_orders.id
-	not-null:  yes
+	required:  yes
       - name:      item_id
         ref:       items.id
-        not-null:  yes
+        required:  yes
       - name:      price
         type:      money
-        not-null:  yes
+        required:  yes
       - name:      quantity
         type:      int
-        not-null:  yes
-    primary-keys:  [ order_id, item_id ]
+        required:  yes