projects
/
dbsrgits/DBIx-Class.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7856c0d
ed8de05
)
Merge 'datetime' into 'DBIx-Class-current'
Matt S Trout [Sat, 20 May 2006 00:54:44 +0000 (
00:54
+0000)]
1
2
lib/DBIx/Class/Storage/DBI.pm
patch
|
diff1
|
diff2
|
blob
|
history
t/lib/DBICTest/Setup.pm
patch
|
diff1
|
diff2
|
blob
|
history
t/lib/sqlite.sql
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/DBIx/Class/Storage/DBI.pm
Simple merge
diff --cc
t/lib/DBICTest/Setup.pm
index
b493cb6
,
833bebf
..
b327e48
---
1
/
t/lib/DBICTest/Setup.pm
---
2
/
t/lib/DBICTest/Setup.pm
+++ b/
t/lib/DBICTest/Setup.pm
@@@
-147,4
-152,4
+152,9
@@@
$schema->populate('Bookmark',
[ 1, 1 ]
]);
++$schema->populate('Event', [
++ [ qw/id starts_at/ ],
++ [ 1, '2006-04-25 22:24:33' ],
++]);
++
1;
diff --cc
t/lib/sqlite.sql
index
7a13900
,
9e1894c
..
2f37699
---
1
/
t/lib/sqlite.sql
---
2
/
t/lib/sqlite.sql
+++ b/
t/lib/sqlite.sql
@@@
-1,6
-1,6
+1,6
@@@
--
-- Created by SQL::Translator::Producer::SQLite
---- Created on Sun May 14 18:25:49 2006
++-- Created on Wed Apr 26 03:18:22 2006
--
BEGIN TRANSACTION;