Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snyk] Upgrade drizzle-orm from 0.34.1 to 0.36.0 #1220

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from

Conversation

NiallJoeMaher
Copy link
Contributor

snyk-top-banner

Snyk has created this PR to upgrade drizzle-orm from 0.34.1 to 0.36.0.

ℹ️ Keep your dependencies up-to-date. This makes it easier to fix existing vulnerabilities and to more quickly identify and fix newly disclosed vulnerabilities when they affect your project.


  • The recommended version is 26 versions ahead of your current version.

  • The recommended version was released on 22 days ago.

Release notes
Package name: drizzle-orm
  • 0.36.0 - 2024-10-30

    This version of drizzle-orm requires drizzle-kit@0.27.0 to enable all new features

    New Features

    The third parameter in Drizzle ORM becomes an array

    The object API is still available but deprecated

    Instead of this

    pgTable('users', {
        id: integer().primaryKey(),
    }, (t) => ({
        index: index('test').on(t.id),
    }));

    You can now do this

    pgTable('users', {
        id: integer().primaryKey(),
    }, (t) => [index('test').on(t.id)]);

    Row-Level Security (RLS)

    With Drizzle, you can enable Row-Level Security (RLS) for any Postgres table, create policies with various options, and define and manage the roles those policies apply to.

    Drizzle supports a raw representation of Postgres policies and roles that can be used in any way you want. This works with popular Postgres database providers such as Neon and Supabase.

    In Drizzle, we have specific predefined RLS roles and functions for RLS with both database providers, but you can also define your own logic.

    Enable RLS

    If you just want to enable RLS on a table without adding policies, you can use .enableRLS()

    As mentioned in the PostgreSQL documentation:

    If no policy exists for the table, a default-deny policy is used, meaning that no rows are visible or can be modified.
    Operations that apply to the whole table, such as TRUNCATE and REFERENCES, are not subject to row security.

    import { integer, pgTable } from 'drizzle-orm/pg-core';

    export const users = pgTable('users', {
    id: integer(),
    }).enableRLS();

    If you add a policy to a table, RLS will be enabled automatically. So, there’s no need to explicitly enable RLS when adding policies to a table.

    Roles

    Currently, Drizzle supports defining roles with a few different options, as shown below. Support for more options will be added in a future release.

    import { pgRole } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin', { createRole: true, createDb: true, inherit: true });

    If a role already exists in your database, and you don’t want drizzle-kit to ‘see’ it or include it in migrations, you can mark the role as existing.

    import { pgRole } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin').existing();

    Policies

    To fully leverage RLS, you can define policies within a Drizzle table.

    In PostgreSQL, policies should be linked to an existing table. Since policies are always associated with a specific table, we decided that policy definitions should be defined as a parameter of pgTable

    Example of pgPolicy with all available properties

    import { sql } from 'drizzle-orm';
    import { integer, pgPolicy, pgRole, pgTable } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin');

    export const users = pgTable('users', {
    id: integer(),
    }, (t) => [
    pgPolicy('policy', {
    as: 'permissive',
    to: admin,
    for: 'delete',
    using: sql</span><span class="pl-kos">,</span> <span class="pl-c1">withCheck</span>: <span class="pl-en">sql</span><span class="pl-s">,
    }),
    ]);

    Link Policy to an existing table

    There are situations where you need to link a policy to an existing table in your database.
    The most common use case is with database providers like Neon or Supabase, where you need to add a policy
    to their existing tables. In this case, you can use the .link() API

    import { sql } from "drizzle-orm";
    import { pgPolicy } from "drizzle-orm/pg-core";
    import { authenticatedRole, realtimeMessages } from "drizzle-orm/supabase";

    export const policy = pgPolicy("authenticated role insert policy", {
    for: "insert",
    to: authenticatedRole,
    using: sql``,
    }).link(realtimeMessages);

    Migrations

    If you are using drizzle-kit to manage your schema and roles, there may be situations where you want to refer to roles that are not defined in your Drizzle schema. In such cases, you may want drizzle-kit to skip managing these roles without having to define each role in your drizzle schema and marking it with .existing().

    In these cases, you can use entities.roles in drizzle.config.ts. For a complete reference, refer to the the drizzle.config.ts documentation.

    By default, drizzle-kit does not manage roles for you, so you will need to enable this feature in drizzle.config.ts.

    // drizzle.config.ts
    import { defineConfig } from "drizzle-kit";

    export default defineConfig({
    dialect: 'postgresql',
    schema: "./drizzle/schema.ts",
    dbCredentials: {
    url: process.env.DATABASE_URL!
    },
    verbose: true,
    strict: true,
    entities: {
    roles: true
    }
    });

    In case you need additional configuration options, let's take a look at a few more examples.

    You have an admin role and want to exclude it from the list of manageable roles

    // drizzle.config.ts
    import { defineConfig } from "drizzle-kit";

    export default defineConfig({
    ...
    entities: {
    roles: {
    exclude: ['admin']
    }
    }
    });

    You have an admin role and want to include it in the list of manageable roles

    // drizzle.config.ts
    import { defineConfig } from "drizzle-kit";

    export default defineConfig({
    ...
    entities: {
    roles: {
    include: ['admin']
    }
    }
    });

    If you are using Neon and want to exclude Neon-defined roles, you can use the provider option

    // drizzle.config.ts
    import { defineConfig } from "drizzle-kit";

    export default defineConfig({
    ...
    entities: {
    roles: {
    provider: 'neon'
    }
    }
    });

    If you are using Supabase and want to exclude Supabase-defined roles, you can use the provider option

    // drizzle.config.ts
    import { defineConfig } from "drizzle-kit";

    export default defineConfig({
    ...
    entities: {
    roles: {
    provider: 'supabase'
    }
    }
    });

    You may encounter situations where Drizzle is slightly outdated compared to new roles specified by your database provider.
    In such cases, you can use the provider option and exclude additional roles:

    // drizzle.config.ts
    import { defineConfig } from "drizzle-kit";

    export default defineConfig({
    ...
    entities: {
    roles: {
    provider: 'supabase',
    exclude: ['new_supabase_role']
    }
    }
    });

    RLS on views

    With Drizzle, you can also specify RLS policies on views. For this, you need to use security_invoker in the view's WITH options. Here is a small example:

    export const roomsUsersProfiles = pgView("rooms_users_profiles")
    .with({
    securityInvoker: true,
    })
    .as((qb) =>
    qb
    .select({
    ...getTableColumns(roomsUsers),
    email: profiles.email,
    })
    .from(roomsUsers)
    .innerJoin(profiles, eq(roomsUsers.userId, profiles.id))
    );

    Using with Neon

    The Neon Team helped us implement their vision of a wrapper on top of our raw policies API. We defined a specific
    /neon import with the crudPolicy function that includes predefined functions and Neon's default roles.

    Here's an example of how to use the crudPolicy function:

    import { crudPolicy } from 'drizzle-orm/neon';
    import { integer, pgRole, pgTable } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin');

    export const users = pgTable('users', {
    id: integer(),
    }, (t) => [
    crudPolicy({ role: admin, read: true, modify: false }),
    ]);

    This policy is equivalent to:

    import { sql } from 'drizzle-orm';
    import { integer, pgPolicy, pgRole, pgTable } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin');

    export const users = pgTable('users', {
    id: integer(),
    }, (t) => [
    pgPolicy(crud-<span class="pl-s1"><span class="pl-kos">${</span><span class="pl-s1">admin</span><span class="pl-kos">.</span><span class="pl-c1">name</span><span class="pl-kos">}</span></span>-policy-insert, {
    for: 'insert',
    to: admin,
    withCheck: sqlfalse,
    }),
    pgPolicy(crud-<span class="pl-s1"><span class="pl-kos">${</span><span class="pl-s1">admin</span><span class="pl-kos">.</span><span class="pl-c1">name</span><span class="pl-kos">}</span></span>-policy-update, {
    for: 'update',
    to: admin,
    using: sqlfalse,
    withCheck: sqlfalse,
    }),
    pgPolicy(crud-<span class="pl-s1"><span class="pl-kos">${</span><span class="pl-s1">admin</span><span class="pl-kos">.</span><span class="pl-c1">name</span><span class="pl-kos">}</span></span>-policy-delete, {
    for: 'delete',
    to: admin,
    using: sqlfalse,
    }),
    pgPolicy(crud-<span class="pl-s1"><span class="pl-kos">${</span><span class="pl-s1">admin</span><span class="pl-kos">.</span><span class="pl-c1">name</span><span class="pl-kos">}</span></span>-policy-select, {
    for: 'select',
    to: admin,
    using: sqltrue,
    }),
    ]);

    Neon exposes predefined authenticated and anaonymous roles and related functions. If you are using Neon for RLS, you can use these roles, which are marked as existing, and the related functions in your RLS queries.

    // drizzle-orm/neon
    export const authenticatedRole = pgRole('authenticated').existing();
    export const anonymousRole = pgRole('anonymous').existing();

    export const authUid = (userIdColumn: AnyPgColumn) => sql(select auth.user_id() = <span class="pl-s1"><span class="pl-kos">${</span><span class="pl-s1">userIdColumn</span><span class="pl-kos">}</span></span>);

    For example, you can use the Neon predefined roles and functions like this:

    import { sql } from 'drizzle-orm';
    import { authenticatedRole } from 'drizzle-orm/neon';
    import { integer, pgPolicy, pgRole, pgTable } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin');

    export const users = pgTable('users', {
    id: integer(),
    }, (t) => [
    pgPolicy(policy-insert, {
    for: 'insert',
    to: authenticatedRole,
    withCheck: sqlfalse,
    }),
    ]);

    Using with Supabase

    We also have a /supabase import with a set of predefined roles marked as existing, which you can use in your schema.
    This import will be extended in a future release with more functions and helpers to make using RLS and Supabase simpler.

    // drizzle-orm/supabase
    export const anonRole = pgRole('anon').existing();
    export const authenticatedRole = pgRole('authenticated').existing();
    export const serviceRole = pgRole('service_role').existing();
    export const postgresRole = pgRole('postgres_role').existing();
    export const supabaseAuthAdminRole = pgRole('supabase_auth_admin').existing();

    For example, you can use the Supabase predefined roles like this:

    import { sql } from 'drizzle-orm';
    import { serviceRole } from 'drizzle-orm/supabase';
    import { integer, pgPolicy, pgRole, pgTable } from 'drizzle-orm/pg-core';

    export const admin = pgRole('admin');

    export const users = pgTable('users', {
    id: integer(),
    }, (t) => [
    pgPolicy(policy-insert, {
    for: 'insert',
    to: serviceRole,
    withCheck: sqlfalse,
    }),
    ]);

    The /supabase import also includes predefined tables and functions that you can use in your application

    // drizzle-orm/supabase

    const auth = pgSchema('auth');
    export const authUsers = auth.table('users', {
    id: uuid().primaryKey().notNull(),
    });

    const realtime = pgSchema('realtime');
    export const realtimeMessages = realtime.table(
    'messages',
    {
    id: bigserial({ mode: 'bigint' }).primaryKey(),
    topic: text().notNull(),
    extension: text({
    enum: ['presence', 'broadcast', 'postgres_changes'],
    }).notNull(),
    },
    );

    export const authUid = sql(select auth.uid());
    export const realtimeTopic = sqlrealtime.topic();

    This allows you to use it in your code, and Drizzle Kit will treat them as existing databases,
    using them only as information to connect to other entities

    import { foreignKey, pgPolicy, pgTable, text, uuid } from "drizzle-orm/pg-core";
    import { sql } from "drizzle-orm/sql";
    import { authenticatedRole, authUsers } from "drizzle-orm/supabase";

    export const profiles = pgTable(
    "profiles",
    {
    id: uuid().primaryKey().notNull(),
    email: text().notNull(),
    },
    (table) => [
    foreignKey({
    columns: [table.id],
    // reference to the auth table from Supabase
    foreignColumns: [authUsers.id],
    name: "profiles_id_fk",
    }).onDelete("cascade"),
    pgPolicy("authenticated can view all profiles", {
    for: "select",
    // using predefined role from Supabase
    to: authenticatedRole,
    using: sqltrue,
    }),
    ]
    );

    Let's check an example of adding a policy to a table that exists in Supabase

    import { sql } from "drizzle-orm";
    import { pgPolicy } from "drizzle-orm/pg-core";
    import { authenticatedRole, realtimeMessages } from "drizzle-orm/supabase";

    export const policy = pgPolicy("authenticated role insert policy", {
    for: "insert",
    to: authenticatedRole,
    using: sql``,
    }).link(realtimeMessages);

    Bug fixes

  • 0.36.0-cfa88dd - 2024-11-03
  • 0.36.0-998119e - 2024-11-04
  • 0.36.0-96d338b - 2024-11-06
  • 0.36.0-5ea5a84 - 2024-10-30
  • 0.36.0-4d56096 - 2024-11-04
  • 0.36.0-19f042a - 2024-11-04
  • 0.35.3 - 2024-10-21

    New LibSQL driver modules

    Drizzle now has native support for all @ libsql/client driver variations:

    1. @ libsql/client - defaults to node import, automatically changes to web if target or platform is set for bundler, e.g. esbuild --platform=browser
    import { drizzle } from 'drizzle-orm/libsql';

    const db = drizzle({ connection: {
    url: process.env.DATABASE_URL,
    authToken: process.env.DATABASE_AUTH_TOKEN
    }});

    1. @ libsql/client/node node compatible module, supports :memory:, file, wss, http and turso connection protocols
    import { drizzle } from 'drizzle-orm/libsql/node';

    const db = drizzle({ connection: {
    url: process.env.DATABASE_URL,
    authToken: process.env.DATABASE_AUTH_TOKEN
    }});

    1. @ libsql/client/web module for fullstack web frameworks like next, nuxt, astro, etc.
    import { drizzle } from 'drizzle-orm/libsql/web';

    const db = drizzle({ connection: {
    url: process.env.DATABASE_URL,
    authToken: process.env.DATABASE_AUTH_TOKEN
    }});

    1. @ libsql/client/http module for http and https connection protocols
    import { drizzle } from 'drizzle-orm/libsql/http';

    const db = drizzle({ connection: {
    url: process.env.DATABASE_URL,
    authToken: process.env.DATABASE_AUTH_TOKEN
    }});

    1. @ libsql/client/ws module for ws and wss connection protocols

Snyk has created this PR to upgrade drizzle-orm from 0.34.1 to 0.36.0.

See this package in npm:
drizzle-orm

See this project in Snyk:
https://app.snyk.io/org/nialljoemaher/project/8ac19f6c-c7f2-4720-acd1-09701979877c?utm_source=github&utm_medium=referral&page=upgrade-pr
@NiallJoeMaher NiallJoeMaher requested a review from a team as a code owner November 22, 2024 00:28
Copy link

vercel bot commented Nov 22, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
codu ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 22, 2024 0:35am

Copy link
Contributor

coderabbitai bot commented Nov 22, 2024

Important

Review skipped

Ignore keyword(s) in the title.

⛔ Ignored keywords (1)
  • [Snyk]

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants