Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
compare: 6eb24dbb2ba703b3cf3522fea8bcc10ebf44b4a9
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Feb 13, 2010
@mkristian mkristian first go with dm-hibernate-adapter
631641e
@mkristian mkristian little docu to set it up
d225170
Commits on Feb 14, 2010
@pietia pietia .gitignore file updated to ignore editors' temporary files
e4b44eb
@pietia pietia Removed temporary file
b841a89
@pietia pietia Added Saumya's Plugins repository to maven's config
ef3ecc9
@pietia pietia Modified readme.txt (renaming mvn to mvn3)
31b2f16
@pietia pietia Added TODO,README, some cleanups
d1082fe
@pietia pietia Added Rakefile and specs
b5f2e73
@pietia pietia Formatted README
5f786ab
@pietia pietia Testing database switched to H2, Hibernate version bumped to 3.3.2
43a1caa
@pietia pietia SQL formatting turned on
984c3de
@pietia pietia Copied and modified dm-core specs for Jibernate(for current work)
77f599a
@pietia pietia Added info about running specs
1103a38
@pietia pietia Added few more supported types to specs
349699e
Commits on Feb 15, 2010
@pietia pietia Added delete() to adpater, improved logger
5bd23af
@mkristian mkristian added annotation stuff from from http://github.com/superchris/hibernate
3b9921c
@mkristian mkristian deleted obsolete files
80de392
@mkristian mkristian removed the need to declare model twice, use datamapper only now
bf8cbfb
@pietia pietia Reworked structure of imports and directories layout
0eb534d
@mkristian mkristian fixed conflict on merge from pietia
e62dac3
@pietia pietia Added spec template for HibernateAdapter specyfic stuff
3a5875f
@pietia pietia Simplified Hibernate/DM model definition
7591c17
@pietia pietia Minor cleanups in README
f2a70d7
Commits on Feb 16, 2010
@pietia pietia Added #update skeleton
c17c64c
@pietia pietia Added more code/specs to test #update
28eece3
@mkristian mkristian made update work, and handle Date in special way
ce7e6e7
@mkristian mkristian Merge branch 'master' of git@github.com:mkristian/jibernate
46908a0
Commits on Feb 21, 2010
@pietia pietia Added info about running specs
6c724f1
@pietia pietia Added few test cases
efd6ee4
@pietia pietia Added TODO plan
5115c99
@pietia pietia Added first version of generating queries
a1c0d16
Commits on Feb 22, 2010
@pietia pietia some minor cleanups
4186d2a
@pietia pietia TODO updated
820b610
@pietia pietia Now DM+Hibernate model looks 1:1 like DM model
9f6f87f
Commits on Feb 23, 2010
@pietia pietia First version of auto_migrate! (drops all tables,not only one)
efebb63
@pietia pietia Fixed some typos(missed alias, typo in comment)
51a899f
@mkristian mkristian added some adapter config parameter for the jdbc connection
16a1dc2
@mkristian mkristian Merge branch 'master' of git@github.com:mkristian/jibernate
3286fc4
@pietia pietia Ignored more files (more dbs)
ce6f0bc
@pietia pietia Added hsqldb,derby to pom.xml
a4dfaba
@pietia pietia Added configs for 2 more testing dbs
5782a04
@pietia pietia Logger turned on
70b9619
@pietia pietia merged README/TODO, added mysql/postgres configs, bumped hsqldb version
5b08c7c
@mkristian mkristian give concrete pluigin version
cf6442f
@pietia pietia Added regexps and queries like 'IN (empty set)'
d95c375
@mkristian mkristian Merge branch 'master' of git@github.com:mkristian/jibernate
8e88459
@pietia pietia Added BETWEEN
73cff86
Commits on Feb 24, 2010
@mkristian mkristian * added log4j config and allow debug log of SQL statements
* made all the commented logs going through the logger
fc8469f
@mkristian mkristian * added log4j config for specs and logs SQL statements and other debug
* reinstated query and update logs
6b4ecfe
@pietia pietia Added new spec task + copied dm-core specs
fa77e4a
Commits on Feb 25, 2010
@pietia pietia Added 'transient' specs
19d0d4a
@mkristian mkristian * added more types as well custom DM types
* handle key properties properly (sinlge keys only)
ff1f99e
@mkristian mkristian fixed broken type resolution
ae861e6
@pietia pietia auto_migrate! added in specs, added loggers in some places
fa7faa1
@pietia pietia Temporary removed nested classes from specs
8d36e02
Commits on Feb 26, 2010
@mkristian mkristian * added column constraints
* added table name

* replaced DataMapper::Boolean with TrueClass which is primative of the Boolean typ
23c0a68
@mkristian mkristian Merge branch 'master' of git@github.com:mkristian/jibernate into work…
…space
6fd45ce
@pietia pietia bad formatting
b261907
Commits on Feb 28, 2010
@mkristian mkristian * added discriminator (javax.persistence) annotations without specs
* added index (hibernate) annotations with out specs

* added specs for column contraints on create and fixed error handling in adapter on create
58df5f9
Commits on Mar 01, 2010
@mkristian mkristian added java logger, use it and set it also as dm-logger. made logger c…
…lass members instead of instance members.
88f0ef4
Commits on May 12, 2010
douglas fix to avoid java_class reference whitout become_java! to be called
85bced9
@mkristian mkristian help to share config with demo
fc00144
@mkristian mkristian fixed the adapter spec by added special getter/setter for DateTime an…
…d BigDecimal
de345d6
@mkristian mkristian added demo rails application - localhost:3000/users already works ;-)
3ec3c1b
@mkristian mkristian moved test DBs into target directory and allow to switch adapter via …
…DIALECT=DERBY_EMB when executing the spec, etc
302f80f
@mkristian mkristian cleanup
be17cce
@mkristian mkristian added auto-require for jibernate
24d8c9e
@mkristian mkristian added some words about rails demo
c50f1e0
@mkristian mkristian * slf4r gem which uses slf4j as default
* share log4j cibfug between soecs
60a7d34
Commits on May 16, 2010
@mkristian mkristian * added auto_upgrade! to model class
* fixed date_time setter

* for all properties there are special getter/setter - this allows datamapper resource to overwrite there getter to return some fancy object (like unmarshalled data)
92a53d0
@mkristian mkristian new version for jruby + maven plugins
6ff32ff
@mkristian mkristian added auto_upgrade! stub and cleaned up obsolete aliases
8f711bd
@mkristian mkristian commented out none existing artifact until it reaches central reposit…
…ory (should happen soon)
59d61fc
Commits on May 17, 2010
douglas spec for associations added
1c5670f
@mkristian mkristian made the 1-n-association to fail properly
545b052
@mkristian mkristian made the 1-n-association to fail properly and made logging nicer
5b8ed64
@mkristian mkristian Merge branch 'master' of github.com:mkristian/jibernate
Conflicts:
	spec/abstract_adapter/adapter_shared_spec.rb
36a1090
Commits on May 20, 2010
@mkristian mkristian made many to one work
08a0538
Commits on May 28, 2010
douglas add ManyToOne phisically columns through relationship
e535f7c
Commits on May 31, 2010
@mkristian mkristian fix the demo again/maybe
8ab1b66
Commits on Jun 19, 2010
@mkristian mkristian added some constraints for fast testing
cbee9a3
@mkristian mkristian * switch to datamapper 1.0.0
* added execute_update method to the adapter which allows to excute SQL directly

* added new hsqldb jdbc driver in pom
303a777
@mkristian mkristian switch demo to DM 1.0.0 as well
aad9d04
@mkristian mkristian remove deprected warning
81c6eec
Commits on Jun 25, 2010
@mkristian mkristian removed the pom-parent.xml - the jruby plugin pulls now both jars as …
…well gems as needed
115eaa9
@mkristian mkristian auto_migrate! needs an argument
8f05774
Commits on Jul 31, 2010
@pietia pietia ignored .idea/
839fe1f
@pietia pietia some docu, added jruby-maven-gem to pom.xml
77c0b9c
Commits on Aug 01, 2010
@pietia pietia use autocomit where there is no transaction
7fc9700
@pietia pietia docu
e1dbe6f
@pietia pietia simple rollback in test code
c00f45c
@pietia pietia first implementation of TXs
665227b
Commits on Aug 02, 2010
Piotr Gega typo in filename (demo)
3de30f2
Commits on Aug 05, 2010
@pietia pietia some refactorings,cleanups
196d258
@pietia pietia Merge branch 'master' of github.com:mkristian/jibernate
9cc3b6a
Commits on Aug 06, 2010
@pietia pietia super() takes 2 args
3b34d18
Commits on Aug 07, 2010
@pietia pietia changed README
d9a4080
@pietia pietia refactorings
56e878a
@pietia pietia some debugging info turned on, started work on assocations
ce9ec10
@pietia pietia private methods reformated
1a9e119
Commits on Aug 08, 2010
@pietia pietia bug in eventlog :)
ed4457d
Commits on Nov 19, 2010
douglas update on jruby-maven-plugins, fix gem repository configuration for d…
…emo project
65cb91d
@douglasrodrigo douglasrodrigo update on jruby-maven-plugins, fix gem repository configuration for d…
…emo project
90f0713
Commits on Nov 20, 2010
@douglasrodrigo douglasrodrigo tutorial updated, fix in maven dependencies, repositories
5626246
@pietia pietia dm-core upgraded, added setup.rb (for running specs)
a282948
Commits on Nov 24, 2010
@douglasrodrigo douglasrodrigo gem path on pom, fix to avoid nil query object
a32a11d
@douglasrodrigo douglasrodrigo merge with remote master
3dda77f
Commits on Nov 30, 2010
@douglasrodrigo douglasrodrigo dm specs running on 1.0.2
7b4439a
@douglasrodrigo douglasrodrigo dm-core specs fixes
62e7a3e
Commits on Dec 07, 2010
@douglasrodrigo douglasrodrigo hacks to make all specs run
d2393c0
@douglasrodrigo douglasrodrigo some cleanups
f32a364
@pietia pietia info about j-m-p
8be4dc0
Commits on Jan 05, 2011
@douglasrodrigo douglasrodrigo new jruby plugins version, changes to use hooks instead of wrappers t…
…o call hibernate method
12f549a
@douglasrodrigo douglasrodrigo Merge branch 'master' of github.com:mkristian/jibernate
3377548
Commits on Jan 17, 2011
@douglasrodrigo douglasrodrigo adding jvm args configuration to run dm specs
5b227e6
Commits on Mar 05, 2011
@pietia pietia info about skiping tests
6856271
Commits on Jun 20, 2011
@mkristian mkristian custom classloader to handle the javanized ruby models
d8ac6a9
@mkristian mkristian not sure if this all is needed but it did not work with me otherwise …
…- anyways a place to cleanup things
7baf9f1
Commits on Jun 23, 2011
@mkristian mkristian added ruby-maven config
787c205
Commits on Jun 24, 2011
@mkristian mkristian reset the hibernate config after each spec run
bcc045c
Commits on Jun 26, 2011
@mkristian mkristian make the version constraint more liberal
c68e342
@mkristian mkristian have a classloader wrapper for an standard classloader as well
5a5d74d
@mkristian mkristian adjustment
c135240
@mkristian mkristian have a classloader wrapper for an standard classloader as well
aae11b9
@mkristian mkristian moved demo to rails3 and ruby-maven setup
cddb943
Commits on Jun 29, 2011
@pietia pietia ignored files
84a46df
@pietia pietia .rvmrc with gemset per project
ec38ef7
@pietia pietia more docu about offline mode
9a32e2d
@mkristian mkristian round up and new plugin version
da56603
Commits on Jul 01, 2011
@douglasrodrigo douglasrodrigo dm-core update to 1.1.0, dm specs removed
333f2c0
Commits on Jul 03, 2011
@mkristian mkristian with extlib . . .
03dbf0a
@mkristian mkristian * new jboss url
* only one README
decbe0d
@mkristian mkristian follow changed versions
7fd7271
Commits on Jul 07, 2011
@douglasrodrigo douglasrodrigo validating nil order in queries on hibernate adapter
59aadeb
Commits on Jul 08, 2011
@mkristian mkristian little change bit commit no actual change
95e66a2
@mkristian mkristian Merge branch 'master' of github.com:mkristian/jibernate
fa6c94d
Commits on Jul 17, 2011
@pietia pietia upgraded rvmrc to 1.6.3
34b3c15
@pietia pietia upgraded to 1.6.3 in all config files, also don't try to call methods…
… when there is no relationship
c8cb33c
Commits on Jul 26, 2011
@mkristian mkristian pushed a prerelease gem to rubygems.org - added authors for this
8ea0b26
@mkristian mkristian merge
10218f0
@mkristian mkristian bump version
8d709d9
Commits on Sep 27, 2011
@pietia pietia initial cleanups
285ad54
@pietia pietia more cleanups
5a5baf0
@pietia pietia more cleanups
84d4ada
@pietia pietia use jruby-1.6.4
2852ef5
Commits on Sep 28, 2011
@mkristian mkristian become hibernate java class on model A.create
e2a1d20
Commits on Sep 30, 2011
@pietia pietia #initialize hack turned off since it produces errors in specs
7d150db
@pietia pietia lets try to fix #execute_update
79e1987
@douglasrodrigo douglasrodrigo using session.doWork to avoid the use of insane session.connection
1bd31a4
Commits on Oct 01, 2011
@mkristian mkristian we do all use ruby-maven now (?). rearranged order of author to be al…
…phabetically over firstname (any other order is finewith me, too :)
8bb9e39
@pietia pietia corrected email
4dd19cd
@pietia pietia some motivation: added empty LICENSE
3d0e6df
@pietia pietia cleanups, now we can pass ENV variables in order to turn on/off SQL l…
…ogging
b168d05
@pietia pietia better README - logging
fe64815
@pietia pietia README++ (authors, LICENSE.md referenced, some tweaks)
c9e376a
@pietia pietia formatting
e105ef2
@pietia pietia formatting
1d468bd
Commits on Oct 02, 2011
@pietia pietia cleanups: typo, removed unused meethod
7915d1b
@pietia pietia Rake in README
3231501
Commits on Oct 04, 2011
@douglasrodrigo douglasrodrigo make associations work again
ffbf1fb
Commits on Oct 10, 2011
@mkristian mkristian added apache license + header in lib files
563bd0e
@mkristian mkristian updated ref
839cf5b
@mkristian mkristian cleanup maven setup
8b56a7f
@mkristian mkristian * add jruby-classloader wrapper to allow reload of ruby classes which…
… became_java!

* added option to adapter to use the wrapper classloader or not to use it
f713bd8
Commits on Oct 13, 2011
@mkristian mkristian little fixes
e228cfb
Commits on Oct 15, 2011
@pietia pietia thiner files are nicer
b3e294c
@pietia pietia require dm-{transactions,migrations}
179288d
@pietia pietia specs - cleanups, part 1
bb5529d
Commits on Oct 16, 2011
@pietia pietia #12 - we dont need eventlog
a1d9452
@pietia pietia cleanups - dont call auto_migrate! twice
7b1ac1e
@pietia pietia but we need to clean-up before ...
a671dc5
@pietia pietia docu: main db vendors
0d25fe3
Commits on Oct 20, 2011
@pietia pietia setup.rb
17b19b5
@pietia pietia setup.rb - we need to connect at first
a61b9ab
Commits on Oct 21, 2011
@pietia pietia read ENV['RELOAD']
0a39c60
Commits on Nov 10, 2011
@douglasrodrigo douglasrodrigo putting hibernate! call on DataMapper.finalize method
8afce90
@douglasrodrigo douglasrodrigo Merge branch 'master' of github.com:mkristian/dm-hibernate-adapter
2a33b24
@douglasrodrigo douglasrodrigo moving require shared adapter_spec
7a875c4
@douglasrodrigo douglasrodrigo removing adapter_shared spec from spec_helper
3246422
Commits on Nov 15, 2011
@douglasrodrigo douglasrodrigo refactoring of all java hooks conversion and adding first part of com…
…posite key support
6eb24db