[Rt-commit] r3669 - in Jifty-DBI/trunk: . ex inc/Module
inc/Module/Install lib/Jifty/DBI t
glasser at bestpractical.com
glasser at bestpractical.com
Thu Aug 18 12:03:41 EDT 2005
Author: glasser
Date: Thu Aug 18 12:03:40 2005
New Revision: 3669
Modified:
Jifty-DBI/trunk/ (props changed)
Jifty-DBI/trunk/MANIFEST
Jifty-DBI/trunk/README
Jifty-DBI/trunk/ex/create_tables.pl
Jifty-DBI/trunk/inc/Module/Install.pm
Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
Jifty-DBI/trunk/inc/Module/Install/Base.pm
Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm
Jifty-DBI/trunk/t/utils.pl
Log:
r40054 at tin-foil: glasser | 2005-08-18 11:43:41 -0400
Local branch of Jifty::DBI
r40055 at tin-foil: glasser | 2005-08-18 11:45:37 -0400
Change name of test environment variables.
r40056 at tin-foil: glasser | 2005-08-18 11:59:26 -0400
Lower-case API for SchemaGenerator.
r40057 at tin-foil: glasser | 2005-08-18 12:01:44 -0400
MANIFEST
Modified: Jifty-DBI/trunk/MANIFEST
==============================================================================
--- Jifty-DBI/trunk/MANIFEST (original)
+++ Jifty-DBI/trunk/MANIFEST Thu Aug 18 12:03:40 2005
@@ -7,6 +7,7 @@
inc/Module/Install/Base.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
+lib/Jifty/DBI.pm
lib/Jifty/DBI/Collection.pm
lib/Jifty/DBI/Handle.pm
lib/Jifty/DBI/Handle/Informix.pm
@@ -27,6 +28,7 @@
META.yml
README
ROADMAP
+SIGNATURE
t/00.load.t
t/01basics.t
t/01records.t
Modified: Jifty-DBI/trunk/README
==============================================================================
--- Jifty-DBI/trunk/README (original)
+++ Jifty-DBI/trunk/README Thu Aug 18 12:03:40 2005
@@ -15,8 +15,8 @@
TESTING
In order to test most of the features of Jifty::DBI, you need
to provide "make test" with a test database. For each DBI driver that
- you would like to test, set the environment variables "SB_TEST_FOO",
- "SB_TEST_FOO_USER", and "SB_TEST_FOO_PASS" to a database name, database
+ you would like to test, set the environment variables "JDBI_TEST_FOO",
+ "JDBI_TEST_FOO_USER", and "JDBI_TEST_FOO_PASS" to a database name, database
username, and database password, where "FOO" is the driver name in all
uppercase. You can test as many drivers as you like. (The appropriate
"DBD::" module needs to be installed in order for the test to work.)
@@ -24,8 +24,8 @@
"DBD::Sqlite" is installed, using a temporary file as the database. For
example:
- SB_TEST_MYSQL=test SB_TEST_MYSQL_USER=root SB_TEST_MYSQL_PASS=foo \
- SB_TEST_PG=test SB_TEST_PG_USER=postgres make test
+ JDBI_TEST_MYSQL=test JDBI_TEST_MYSQL_USER=root JDBI_TEST_MYSQL_PASS=foo \
+ JDBI_TEST_PG=test JDBI_TEST_PG_USER=postgres make test
AUTHOR
Copyright (c) 2001-2005 Jesse Vincent, jesse at fsck.com.
Modified: Jifty-DBI/trunk/ex/create_tables.pl
==============================================================================
--- Jifty-DBI/trunk/ex/create_tables.pl (original)
+++ Jifty-DBI/trunk/ex/create_tables.pl Thu Aug 18 12:03:40 2005
@@ -51,8 +51,8 @@
die "Couldn't make SchemaGenerator" unless $SG;
for my $model (__PACKAGE__->models) {
- my $ret = $SG->AddModel($model);
+ my $ret = $SG->add_model($model);
$ret or die "couldn't add model $model: ".$ret->error_message;
}
-print $SG->CreateTableSQLText;
+print $SG->create_table_sql_text;
Modified: Jifty-DBI/trunk/inc/Module/Install.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install.pm Thu Aug 18 12:03:40 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install.pm - /usr/local/share/perl/5.8.4/Module/Install.pm"
+#line 1 "inc/Module/Install.pm - /Library/Perl/5.8.6/Module/Install.pm"
package Module::Install;
$VERSION = '0.36';
Modified: Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/AutoInstall.pm Thu Aug 18 12:03:40 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/AutoInstall.pm - /usr/local/share/perl/5.8.4/Module/Install/AutoInstall.pm"
+#line 1 "inc/Module/Install/AutoInstall.pm - /Library/Perl/5.8.6/Module/Install/AutoInstall.pm"
package Module::Install::AutoInstall;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/inc/Module/Install/Base.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Base.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Base.pm Thu Aug 18 12:03:40 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Base.pm - /usr/local/share/perl/5.8.4/Module/Install/Base.pm"
+#line 1 "inc/Module/Install/Base.pm - /Library/Perl/5.8.6/Module/Install/Base.pm"
package Module::Install::Base;
#line 28
Modified: Jifty-DBI/trunk/inc/Module/Install/Makefile.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Makefile.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Makefile.pm Thu Aug 18 12:03:40 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Makefile.pm - /usr/local/share/perl/5.8.4/Module/Install/Makefile.pm"
+#line 1 "inc/Module/Install/Makefile.pm - /Library/Perl/5.8.6/Module/Install/Makefile.pm"
package Module::Install::Makefile;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/inc/Module/Install/Metadata.pm
==============================================================================
--- Jifty-DBI/trunk/inc/Module/Install/Metadata.pm (original)
+++ Jifty-DBI/trunk/inc/Module/Install/Metadata.pm Thu Aug 18 12:03:40 2005
@@ -1,4 +1,4 @@
-#line 1 "inc/Module/Install/Metadata.pm - /usr/local/share/perl/5.8.4/Module/Install/Metadata.pm"
+#line 1 "inc/Module/Install/Metadata.pm - /Library/Perl/5.8.6/Module/Install/Metadata.pm"
package Module::Install::Metadata;
use Module::Install::Base; @ISA = qw(Module::Install::Base);
Modified: Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm (original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/Collection.pm Thu Aug 18 12:03:40 2005
@@ -1419,7 +1419,7 @@
In order to test most of the features of C<Jifty::DBI::Collection>,
you need to provide C<make test> with a test database. For each DBI
driver that you would like to test, set the environment variables
-C<SB_TEST_FOO>, C<SB_TEST_FOO_USER>, and C<SB_TEST_FOO_PASS> to a
+C<JDBI_TEST_FOO>, C<JDBI_TEST_FOO_USER>, and C<JDBI_TEST_FOO_PASS> to a
database name, database username, and database password, where "FOO"
is the driver name in all uppercase. You can test as many drivers as
you like. (The appropriate C<DBD::> module needs to be installed in
@@ -1427,8 +1427,8 @@
automatically be tested if C<DBD::Sqlite> is installed, using a
temporary file as the database. For example:
- SB_TEST_MYSQL=test SB_TEST_MYSQL_USER=root SB_TEST_MYSQL_PASS=foo \
- SB_TEST_PG=test SB_TEST_PG_USER=postgres make test
+ JDBI_TEST_MYSQL=test JDBI_TEST_MYSQL_USER=root JDBI_TEST_MYSQL_PASS=foo \
+ JDBI_TEST_PG=test JDBI_TEST_PG_USER=postgres make test
=head1 AUTHOR
Modified: Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm
==============================================================================
--- Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm (original)
+++ Jifty-DBI/trunk/lib/Jifty/DBI/SchemaGenerator.pm Thu Aug 18 12:03:40 2005
@@ -33,11 +33,11 @@
return $self;
}
-=for public_doc AddModel MODEL
+=for public_doc add_model MODEL
Adds a new model class to the SchemaGenerator. Model should either be an object
of a subclass of C<Jifty::DBI::Record>, or the name of such a subclass; in the
-latter case, C<AddModel> will instantiate an object of the subclass.
+latter case, C<add_model> will instantiate an object of the subclass.
The model must define the instance methods C<Schema> and C<Table>.
@@ -46,7 +46,7 @@
=cut
-sub AddModel {
+sub add_model {
my $self = shift;
my $model = shift;
@@ -68,48 +68,48 @@
$model = $new_model;
}
- my $table_obj = $self->_DBSchemaTableFromModel($model);
+ my $table_obj = $self->_db_schema_table_from_model($model);
$self->_db_schema->addtable($table_obj);
1;
}
-=for public_doc CreateTableSQLStatements
+=for public_doc create_table_sql_statements
Returns a list of SQL statements (as strings) to create tables for all of
the models added to the SchemaGenerator.
=cut
-sub CreateTableSQLStatements {
+sub create_table_sql_statements {
my $self = shift;
# The sort here is to make it predictable, so that we can write tests.
return sort $self->_db_schema->sql( $self->handle->dbh );
}
-=for public_doc CreateTableSQLText
+=for public_doc create_table_sql_text
Returns a string containg a sequence of SQL statements to create tables for all of
the models added to the SchemaGenerator.
=cut
-sub CreateTableSQLText {
+sub create_table_sql_text {
my $self = shift;
- return join "\n", map {"$_ ;\n"} $self->CreateTableSQLStatements;
+ return join "\n", map {"$_ ;\n"} $self->create_table_sql_statements;
}
-=for private_doc _DBSchemaTableFromModel MODEL
+=for private_doc _db_schema_table_from_model MODEL
Takes an object of a subclass of Jifty::DBI::Record; returns a new
C<DBIx::DBSchema::Table> object corresponding to the model.
=cut
-sub _DBSchemaTableFromModel {
+sub _db_schema_table_from_model {
my $self = shift;
my $model = shift;
Modified: Jifty-DBI/trunk/t/utils.pl
==============================================================================
--- Jifty-DBI/trunk/t/utils.pl (original)
+++ Jifty-DBI/trunk/t/utils.pl Thu Aug 18 12:03:40 2005
@@ -106,9 +106,9 @@
my $handle = shift;
return $handle->connect(
driver => 'mysql',
- database => $ENV{'SB_TEST_MYSQL'},
- user => $ENV{'SB_TEST_MYSQL_USER'} || 'root',
- password => $ENV{'SB_TEST_MYSQL_PASS'} || '',
+ database => $ENV{'JDBI_TEST_MYSQL'},
+ user => $ENV{'JDBI_TEST_MYSQL_USER'} || 'root',
+ password => $ENV{'JDBI_TEST_MYSQL_PASS'} || '',
);
}
@@ -117,15 +117,15 @@
my $handle = shift;
return $handle->connect(
driver => 'Pg',
- database => $ENV{'SB_TEST_PG'},
- user => $ENV{'SB_TEST_PG_USER'} || 'postgres',
- password => $ENV{'SB_TEST_PG_PASS'} || '',
+ database => $ENV{'JDBI_TEST_PG'},
+ user => $ENV{'JDBI_TEST_PG_USER'} || 'postgres',
+ password => $ENV{'JDBI_TEST_PG_PASS'} || '',
);
}
=head2 should_test
-Checks environment for C<SB_TEST_*> variables.
+Checks environment for C<JDBI_TEST_*> variables.
Returns true if specified DB back-end should be tested.
Takes one argument C<$driver> name.
@@ -135,7 +135,7 @@
{
my $driver = shift;
return 1 if lc $driver eq 'sqlite';
- my $env = 'SB_TEST_'. uc $driver;
+ my $env = 'JDBI_TEST_'. uc $driver;
return $ENV{$env};
}
More information about the Rt-commit
mailing list